commit yast2-nfs-client for openSUSE:Factory

6 May 2014

Hello community,

here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2014-05-06 13:40:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-nfs-client"

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes	2014-04-05 14:42:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes	2014-05-06 13:40:53.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May  5 14:49:12 CEST 2014 - locilka@suse.com
+
+- Obsolete Service.Status replaced with new Service.active?
+- 3.1.4
+
+-------------------------------------------------------------------

Old:
----
  yast2-nfs-client-3.1.3.tar.bz2

New:
----
  yast2-nfs-client-3.1.4.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.p5u0Ck/_old	2014-05-06 13:40:54.000000000 +0200
+++ /var/tmp/diff_new_pack.p5u0Ck/_new	2014-05-06 13:40:54.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        3.1.3
+Version:        3.1.4
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 

++++++ yast2-nfs-client-3.1.3.tar.bz2 -> yast2-nfs-client-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.changes new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.changes
--- old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.changes	2014-03-28 17:57:03.000000000 +0100
+++ new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.changes	2014-05-05 15:52:50.000000000 +0200
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon May  5 14:49:12 CEST 2014 - locilka@suse.com
+
+- Obsolete Service.Status replaced with new Service.active?
+- 3.1.4
+
+-------------------------------------------------------------------
 Fri Mar 28 16:54:19 UTC 2014 - vmoravec@suse.com
 
 - Fix failing tests again
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.spec new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.spec
--- old/yast2-nfs-client-3.1.3/package/yast2-nfs-client.spec	2014-03-28 17:57:03.000000000 +0100
+++ new/yast2-nfs-client-3.1.4/package/yast2-nfs-client.spec	2014-05-05 15:52:50.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        3.1.3
+Version:        3.1.4
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/src/modules/Nfs.rb new/yast2-nfs-client-3.1.4/src/modules/Nfs.rb
--- old/yast2-nfs-client-3.1.3/src/modules/Nfs.rb	2014-03-28 17:57:03.000000000 +0100
+++ new/yast2-nfs-client-3.1.4/src/modules/Nfs.rb	2014-05-05 15:52:50.000000000 +0200
@@ -34,6 +34,7 @@
       Yast.import "PackageSystem"
       Yast.import "PackagesProposal"
       Yast.import "Wizard"
+      Yast.import "Message"
 
       Yast.include self, "nfs/routines.rb"
 
@@ -519,15 +520,17 @@
 
         Progress.NextStage
         if Ops.greater_than(Builtins.size(@nfs_entries), 0)
-          if Service.Status(@portmapper) != 0
-            # portmap must not be started if it is running already (see bug # 9999)
-            Service.Start(@portmapper)
+          # portmap must not be started if it is running already (see bug # 9999)
+          Service.Start(@portmapper) unless Service.active?(@portmapper)
+
+          unless Service.active?(@portmapper)
+            Report.Error(Message.CannotStartService(@portmapper))
+            return false
           end
 
           Service.Start("nfs")
-          # #74597: if all mounts are noauto, $? is 6 (unconfigured)
-          status = Service.Status("nfs")
-          if status != 0 && status != 6
+
+          unless Service.active?("nfs")
             # error popup message
             Report.Error(_("Unable to mount the NFS entries from /etc/fstab."))
             return false
@@ -614,8 +617,8 @@
 
 
       # start portmapper if it isn't running
-      if Service.Status(portmapper) != 0
-        if Service.Start(portmapper) == false
+      unless Service.active?(portmapper)
+        unless Service.Start(portmapper)
           Builtins.y2warning("%1 cannot be started", portmapper)
           return nil
         end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite.out new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite.out
--- old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite.out	2014-03-28 17:57:03.000000000 +0100
+++ new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite.out	2014-05-05 15:52:50.000000000 +0200
@@ -15,9 +15,7 @@
 Write	.etc.idmapd_conf.value.General.Domain "localhost" true
 Write	.etc.idmapd_conf nil true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "yes" true
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	Unable to mount the NFS entries from /etc/fstab.
+Log	Cannot start 'portmap' service
 Return	false
 Dump	Write KO
 Read	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite2.out new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite2.out
--- old/yast2-nfs-client-3.1.3/testsuite/tests/readwrite2.out	2014-03-28 17:57:03.000000000 +0100
+++ new/yast2-nfs-client-3.1.4/testsuite/tests/readwrite2.out	2014-05-05 15:52:50.000000000 +0200
@@ -17,9 +17,7 @@
 Write	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] true
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	Unable to mount the NFS entries from /etc/fstab.
+Log	Cannot start 'portmap' service
 Return	false
 Dump	
 Dump	Read  - nfs is in use & stopped
@@ -40,9 +38,7 @@
 Write	.etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]] true
 Write	.sysconfig.nfs.NFS4_SUPPORT "no" true
 Write	.sysconfig.nfs.NFS_SECURITY_GSS "no" true
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	[DEPRECIATION] `Status' is deprecated; use `active?` instead
-Log	Unable to mount the NFS entries from /etc/fstab.
+Log	Cannot start 'portmap' service
 Return	false
 Dump	
 Dump	Read  - nfs not used & running

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)