Hello community, here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2014-05-06 13:40:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes 2014-04-05 14:42:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new/yast2-nfs-server.changes 2014-05-06 13:40:54.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 5 15:54:01 CEST 2014 - locilka@suse.com + +- Obsolete Service.Status calls replaced with Service.active? +- Finally dropped obsolete 'portmap' support (using only rpcbind) +- Adapted testsuite +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-nfs-server-3.1.5.tar.bz2 New: ---- yast2-nfs-server-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-server.spec ++++++ --- /var/tmp/diff_new_pack.lNcvWK/_old 2014-05-06 13:40:56.000000000 +0200 +++ /var/tmp/diff_new_pack.lNcvWK/_new 2014-05-06 13:40:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 Url: https://github.com/yast/yast-nfs-server ++++++ yast2-nfs-server-3.1.5.tar.bz2 -> yast2-nfs-server-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.changes new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes --- old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.changes 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.changes 2014-05-05 16:39:50.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon May 5 15:54:01 CEST 2014 - locilka@suse.com + +- Obsolete Service.Status calls replaced with Service.active? +- Finally dropped obsolete 'portmap' support (using only rpcbind) +- Adapted testsuite +- 3.1.6 + +------------------------------------------------------------------- Fri Mar 28 15:47:26 UTC 2014 - vmoravec@suse.com - Fix testsuite again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.spec new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec --- old/yast2-nfs-server-3.1.5/package/yast2-nfs-server.spec 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/package/yast2-nfs-server.spec 2014-05-05 16:39:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-nfs-server -Version: 3.1.5 +Version: 3.1.6 Release: 0 URL: https://github.com/yast/yast-nfs-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/src/modules/NfsServer.rb new/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb --- old/yast2-nfs-server-3.1.5/src/modules/NfsServer.rb 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/src/modules/NfsServer.rb 2014-05-05 16:39:50.000000000 +0200 @@ -76,7 +76,8 @@ @have_nfslock = true - @portmapper = nil + # Since SLE 11, there's no portmapper, but rpcbind + @portmapper = "rpcbind" end # Function sets internal variable, which indicates, that any @@ -202,19 +203,6 @@ true end - # Get the used port mapper: since SLE11A3 we have rpcbind - # instead of portmap as the default (bnc#423026) - def Portmapper - if @portmapper == nil - @portmapper = Service.Find(["rpcbind", "portmap"]) - if @portmapper == "" - Builtins.y2error("No portmapper found") - @portmapper = "rpcbind" - end - end - @portmapper - end - # Saves NFS server configuration. (exports(5)) # Creates any missing directories. # @return true on success @@ -292,7 +280,7 @@ end end else - if !Service.Enable(Portmapper()) + if !Service.Enable(@portmapper) Report.Error(Service.Error) ok = false end @@ -308,23 +296,22 @@ end if @enable_nfsv4 - if Service.Status("idmapd") == 3 - if !Service.Start("idmapd") + if !Service.active?("idmapd") + unless Service.Start("idmapd") Report.Error( _("Unable to start idmapd. Check your domain setting.") ) ok = false end - end - if Service.Status("idmapd") == 0 - if !Service.Restart("idmapd") + else + unless Service.Restart("idmapd") Report.Error(_("Unable to restart idmapd.")) ok = false end end else - if Service.Status("idmapd") == 3 - if !Service.Stop("idmapd") + unless Service.active?("idmapd") + unless Service.Stop("idmapd") Report.Error(_("Unable to stop idmapd.")) ok = false end @@ -332,8 +319,8 @@ end if @nfs_security - if Service.Status("svcgssd") == 3 - if !Service.Start("svcgssd") + if !Service.active?("svcgssd") + unless Service.Start("svcgssd") # FIXME svcgssd is gone! (only nfsserver is left) Report.Error( _( @@ -342,18 +329,17 @@ ) ok = false end - end - if Service.Status("svcgssd") == 0 - if !Service.Restart("svcgssd") + else + unless Service.Restart("svcgssd") Report.Error( - _("'svcgssd' is already running. Unable to restart it.") + _("Unable to restart 'svcgssd' service.") ) ok = false end end else - if Service.Status("svcgssd") == 0 - if !Service.Stop("svcgssd") + if Service.active?("svcgssd") + unless Service.Stop("svcgssd") Report.Error(_("'svcgssd' is running. Unable to stop it.")) ok = false end @@ -361,16 +347,15 @@ end if !@write_only - if Service.Status(Portmapper()) != 0 - # portmap must not be started if it is running already (see bug # 9999) - Service.Start(Portmapper()) + unless Service.active?(@portmapper) + Service.Start(@portmapper) end Service.Stop("nfsserver") Service.Restart("nfslock") if @have_nfslock Service.Start("nfsserver") - if Service.Status("nfsserver") != 0 + unless Service.active?("nfsserver") # error popup message Report.Error( _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.5/testsuite/tests/readwrite2.out new/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out --- old/yast2-nfs-server-3.1.5/testsuite/tests/readwrite2.out 2014-03-28 17:30:51.000000000 +0100 +++ new/yast2-nfs-server-3.1.6/testsuite/tests/readwrite2.out 2014-05-05 16:39:50.000000000 +0200 @@ -41,11 +41,6 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Log [DEPRECIATION] `Find' is deprecated; use `SystemdService.find` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Log Unable to restart the NFS server. Return false Dump @@ -91,9 +86,5 @@ Write .sysconfig.nfs.NFS4_SUPPORT "no" true Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true Write .sysconfig.nfs nil true -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead -Log [DEPRECIATION] `Status' is deprecated; use `active?` instead Log Unable to restart the NFS server. Return false -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org