nfs-ganesha 2.8.0 GA
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY
parent
a00bf8e864
commit
def82dfa51
|
|
@ -1,216 +0,0 @@
|
|||
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/admin.py.orig 2019-05-31 10:40:01.592373104 -0400
|
||||
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/admin.py 2019-05-31 10:41:18.182373104 -0400
|
||||
@@ -34,18 +34,18 @@
|
||||
self.show_status = show_status
|
||||
|
||||
def grace(self, ipaddr):
|
||||
- async = self.asyncCall("grace", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("grace", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.admin_done)
|
||||
|
||||
def reload(self):
|
||||
- async = self.asyncCall("reload")
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("reload")
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.admin_done)
|
||||
|
||||
def shutdown(self):
|
||||
- async = self.asyncCall("shutdown")
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("shutdown")
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.admin_done)
|
||||
|
||||
# catch the reply and forward it to the UI
|
||||
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/client_mgr.py.orig 2019-05-31 10:40:09.007373104 -0400
|
||||
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/client_mgr.py 2019-05-31 10:41:41.781373104 -0400
|
||||
@@ -49,18 +49,18 @@
|
||||
self.show_status = show_status
|
||||
|
||||
def AddClient(self, ipaddr):
|
||||
- async = self.asyncCall("AddClient", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("AddClient", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.clientmgr_done)
|
||||
|
||||
def RemoveClient(self, ipaddr):
|
||||
- async = self.asyncCall("RemoveClient", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("RemoveClient", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.clientmgr_done)
|
||||
|
||||
def ShowClients(self):
|
||||
- async = self.asyncCall("ShowClients")
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("ShowClients")
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.clientshow_done)
|
||||
|
||||
# catch the reply and forward it to the UI
|
||||
@@ -114,23 +114,23 @@
|
||||
self.status_handler = status_handler
|
||||
|
||||
def GetNFSv3IO(self, ipaddr):
|
||||
- async = self.asyncCall("GetNFSv3IO", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv3IO", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv40IO(self, ipaddr):
|
||||
- async = self.asyncCall("GetNFSv40IO", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv40IO", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv41IO(self, ipaddr):
|
||||
- async = self.asyncCall("GetNFSv41IO", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv41IO", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv41Layouts(self, ipaddr):
|
||||
- async = self.asyncCall("GetNFSv41Layouts", ipaddr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv41Layouts", ipaddr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.layout_done)
|
||||
|
||||
def io_done(self, call):
|
||||
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/export_mgr.py.orig 2019-05-31 10:40:14.094373104 -0400
|
||||
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/export_mgr.py 2019-05-31 10:42:06.230373104 -0400
|
||||
@@ -54,28 +54,28 @@
|
||||
self.show_status = show_status
|
||||
|
||||
def AddExport(self, conf_path, exp_expr):
|
||||
- async = self.asyncCall("AddExport", conf_path, exp_expr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("AddExport", conf_path, exp_expr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.exportadd_done)
|
||||
|
||||
def UpdateExport(self, conf_path, exp_expr):
|
||||
- async = self.asyncCall("UpdateExport", conf_path, exp_expr)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("UpdateExport", conf_path, exp_expr)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.exportadd_done)
|
||||
|
||||
def RemoveExport(self, exp_id):
|
||||
- async = self.asyncCall("RemoveExport", int(exp_id))
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("RemoveExport", int(exp_id))
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.exportrm_done)
|
||||
|
||||
def DisplayExport(self, exp_id):
|
||||
- async = self.asyncCall("DisplayExport", int(exp_id))
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("DisplayExport", int(exp_id))
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.exportdisplay_done)
|
||||
|
||||
def ShowExports(self):
|
||||
- async = self.asyncCall("ShowExports")
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("ShowExports")
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.exportshow_done)
|
||||
|
||||
def exportadd_done(self, call):
|
||||
@@ -148,23 +148,23 @@
|
||||
self.stats_handler = stats_handler
|
||||
|
||||
def GetNFSv3IO(self, exportid):
|
||||
- async = self.asyncCall("GetNFSv3IO", exportid)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv3IO", exportid)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv40IO(self, exportid):
|
||||
- async = self.asyncCall("GetNFSv40IO", exportid)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv40IO", exportid)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv41IO(self, exportid):
|
||||
- async = self.asyncCall("GetNFSv41IO", exportid)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv41IO", exportid)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.io_done)
|
||||
|
||||
def GetNFSv41Layouts(self, exportid):
|
||||
- async = self.asyncCall("GetNFSv41Layouts", exportid)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetNFSv41Layouts", exportid)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.layout_done)
|
||||
|
||||
def io_done(self, call):
|
||||
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/log_mgr.py.orig 2019-05-31 10:40:19.751373104 -0400
|
||||
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/log_mgr.py 2019-05-31 10:42:16.978373104 -0400
|
||||
@@ -42,8 +42,8 @@
|
||||
self.show_status = show_status
|
||||
|
||||
def GetAll(self):
|
||||
- async = self.asyncCall("GetAll", LOGGER_PROPS)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("GetAll", LOGGER_PROPS)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.GetAll_done)
|
||||
|
||||
def GetAll_done(self, call):
|
||||
@@ -65,8 +65,8 @@
|
||||
self.show_components.emit(prop_dict)
|
||||
|
||||
def Get(self, property):
|
||||
- async = self.asyncCall("Get", LOGGER_PROPS, property)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ _async = self.asyncCall("Get", LOGGER_PROPS, property)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.Get_done)
|
||||
|
||||
def Get_done(self, call):
|
||||
@@ -81,10 +81,10 @@
|
||||
def Set(self, property, setval):
|
||||
qval = QtDBus.QDBusVariant()
|
||||
qval.setVariant(str(str(setval)))
|
||||
- async = self.asyncCall("Set", LOGGER_PROPS,
|
||||
+ _async = self.asyncCall("Set", LOGGER_PROPS,
|
||||
property,
|
||||
qval)
|
||||
- status = QtDBus.QDBusPendingCallWatcher(async, self)
|
||||
+ status = QtDBus.QDBusPendingCallWatcher(_async, self)
|
||||
status.finished.connect(self.Set_done)
|
||||
|
||||
def Set_done(self, call):
|
||||
--- nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py.orig 2019-05-31 10:47:50.611373104 -0400
|
||||
+++ nfs-ganesha-2.8-rc1/src/scripts/ganeshactl/Ganesha/ganesha_mgr_utils.py 2019-05-31 10:49:51.431373104 -0400
|
||||
@@ -363,13 +363,13 @@
|
||||
ts = (time[0],
|
||||
time[1])
|
||||
|
||||
- fss = []
|
||||
+ fss = []
|
||||
for fs in fs_array:
|
||||
filesys1 = FileSys(Path = str(fs[0]),
|
||||
- MajorDevId = fs[1],
|
||||
+ MajorDevId = fs[1],
|
||||
MinorDevId = fs[2])
|
||||
- fss.append(filesys1)
|
||||
- return True, "Done", [ts, fss]
|
||||
+ fss.append(filesys1)
|
||||
+ return True, "Done", [ts, fss]
|
||||
|
||||
|
||||
LOGGER_PROPS = 'org.ganesha.nfsd.log.component'
|
||||
|
|
@ -126,18 +126,17 @@ Requires: openSUSE-release
|
|||
%endif
|
||||
|
||||
%global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") }
|
||||
%global dev rc1
|
||||
%global dash_dev_version 2.8-rc1
|
||||
#%%global dev rc1
|
||||
#%%global dash_dev_version 2.8-rc1
|
||||
|
||||
Name: nfs-ganesha
|
||||
Version: 2.8.0
|
||||
Release: 0.2%{?dev:%{dev}}%{?dist}
|
||||
Release: 1%{?dev:%{dev}}%{?dist}
|
||||
Summary: NFS-Ganesha is a NFS Server running in user space
|
||||
License: LGPLv3+
|
||||
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
||||
|
||||
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
|
||||
Patch1: 0001-src-scripts-ganeshactl-Ganesha.patch
|
||||
Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: bison
|
||||
|
|
@ -492,8 +491,7 @@ Development headers and auxiliary files for developing with %{name}.
|
|||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{dash_dev_version}
|
||||
%patch1 -p1
|
||||
%setup -q -n %{name}-%{version}
|
||||
|
||||
%build
|
||||
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
|
|
@ -869,6 +867,9 @@ exit 0
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri May 31 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-1
|
||||
- nfs-ganesha 2.8.0 GA
|
||||
|
||||
* Fri May 31 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.0-0.2rc1
|
||||
- nfs-ganesha 2.8.0 RC1, utils and gui_utils enabled
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (nfs-ganesha-2.8-rc1.tar.gz) = 5ee34329a9276d9e379e14db4046df60708b67b3647123e52def10de395f76c90e01d3f0746f7d4ab8f425eb465f07522b037dac1ce793571ef0886f943edcb4
|
||||
SHA512 (nfs-ganesha-2.8.0.tar.gz) = 8b15f1240047c17f061b149e4dbb311164f6a5f4dc782a353600932f69d8b505f120508bc45500d44de721b39bc7ebba46bb3e375b041634b92a407204d3656d
|
||||
|
|
|
|||
Loading…
Reference in New Issue