commit yast2-nfs-server for openSUSE:Factory

27 Nov 2018

Hello community,

here is the log from the commit of package yast2-nfs-server for openSUSE:Factory checked in at 2018-11-27 10:38:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nfs-server (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-nfs-server.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-nfs-server"

Tue Nov 27 10:38:54 2018 rev:52 rq:651356 version:4.0.2

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-nfs-server/yast2-nfs-server.changes	2018-07-03 23:33:00.860523890 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-nfs-server.new.19453/yast2-nfs-server.changes	2018-11-27 10:38:56.524407789 +0100
@@ -1,0 +2,17 @@
+Wed Nov 21 16:27:55 UTC 2018 - dgonzalez@suse.com
+
+- Use the real name for nfs-server service instead an alias
+  (bsc#1116779).
+- 4.0.2
+
+-------------------------------------------------------------------
+Tue Oct 16 16:11:30 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Aug 22 16:10:12 CEST 2018 - schubi@suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------

Old:
----
  yast2-nfs-server-4.0.1.tar.bz2

New:
----
  yast2-nfs-server-4.0.2.tar.bz2

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

Other differences:
------------------
++++++ yast2-nfs-server.spec ++++++
--- /var/tmp/diff_new_pack.xV22vM/_old	2018-11-27 10:38:57.000407309 +0100
+++ /var/tmp/diff_new_pack.xV22vM/_new	2018-11-27 10:38:57.004407305 +0100
@@ -17,9 +17,9 @@
 
 
 Name:           yast2-nfs-server
-Version:        4.0.1
+Version:        4.0.2
 Release:        0
-Url:            https://github.com/yast/yast-nfs-server
+URL:            https://github.com/yast/yast-nfs-server
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
@@ -40,7 +40,7 @@
 Requires:       yast2-ruby-bindings >= 1.0.0
 
 Summary:        YaST2 - NFS Server Configuration
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/YaST
 
 %description
@@ -76,6 +76,7 @@
 %{yast_scrconfdir}/etc_exports.scr
 %{yast_agentdir}/ag_exports
 %doc %{yast_docdir}
+%license COPYING
 %{yast_schemadir}/autoyast/rnc/nfs_server.rnc
 
 %files -n yast2-nfs-common

++++++ yast2-nfs-server-4.0.1.tar.bz2 -> yast2-nfs-server-4.0.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-4.0.1/.travis.yml new/yast2-nfs-server-4.0.2/.travis.yml
--- old/yast2-nfs-server-4.0.1/.travis.yml	2018-07-02 18:05:40.000000000 +0200
+++ new/yast2-nfs-server-4.0.2/.travis.yml	2018-11-23 12:18:43.000000000 +0100
@@ -8,4 +8,6 @@
 script:
   # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
   # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
-  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nfs-server-image yast-travis-ruby
+  # exclude the yardoc step, we run the more strict check:doc late
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nfs-server-image yast-travis-ruby -x yardoc
+  - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nfs-server-image rake check:doc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-4.0.1/package/yast2-nfs-server.changes new/yast2-nfs-server-4.0.2/package/yast2-nfs-server.changes
--- old/yast2-nfs-server-4.0.1/package/yast2-nfs-server.changes	2018-07-02 18:05:40.000000000 +0200
+++ new/yast2-nfs-server-4.0.2/package/yast2-nfs-server.changes	2018-11-23 12:18:43.000000000 +0100
@@ -1,4 +1,21 @@
 -------------------------------------------------------------------
+Wed Nov 21 16:27:55 UTC 2018 - dgonzalez@suse.com
+
+- Use the real name for nfs-server service instead an alias
+  (bsc#1116779).
+- 4.0.2
+
+-------------------------------------------------------------------
+Tue Oct 16 16:11:30 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Wed Aug 22 16:10:12 CEST 2018 - schubi@suse.de
+
+- Switched license in spec file from SPDX2 to SPDX3 format.
+
+-------------------------------------------------------------------
 Thu Jun 28 09:40:46 CEST 2018 - schubi@suse.de
 
 - Added additional searchkeys to desktop file (fate#321043).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-4.0.1/package/yast2-nfs-server.spec new/yast2-nfs-server-4.0.2/package/yast2-nfs-server.spec
--- old/yast2-nfs-server-4.0.1/package/yast2-nfs-server.spec	2018-07-02 18:05:40.000000000 +0200
+++ new/yast2-nfs-server-4.0.2/package/yast2-nfs-server.spec	2018-11-23 12:18:43.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-server
-Version:        4.0.1
+Version:        4.0.2
 Release:        0
 URL:            https://github.com/yast/yast-nfs-server
 
@@ -25,7 +25,7 @@
 Source0:        %{name}-%{version}.tar.bz2
 
 Group:	        System/YaST
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 # SuSEFirewall2 replaced by firewalld (fate#323460)
 BuildRequires:	yast2 >= 4.0.39
 BuildRequires:	perl-XML-Writer update-desktop-files yast2-testsuite
@@ -75,6 +75,7 @@
 %{yast_scrconfdir}/etc_exports.scr
 %{yast_agentdir}/ag_exports
 %doc %{yast_docdir}
+%license COPYING
 %{yast_schemadir}/autoyast/rnc/nfs_server.rnc
 
 %files -n yast2-nfs-common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-4.0.1/src/include/nfs_server/routines.rb new/yast2-nfs-server-4.0.2/src/include/nfs_server/routines.rb
--- old/yast2-nfs-server-4.0.1/src/include/nfs_server/routines.rb	2018-07-02 18:05:40.000000000 +0200
+++ new/yast2-nfs-server-4.0.2/src/include/nfs_server/routines.rb	2018-11-23 12:18:43.000000000 +0100
@@ -244,8 +244,8 @@
     end
 
 
-    # @param clients	list of "host(opts)" strings
-    # @return		a string that has comma-separated list of bind target paths.
+    # @param entry list of "host(opts)" strings
+    # @return	[String] a comma-separated list of bind target paths.
     def getbindpaths(entry)
       entry = deep_copy(entry)
       exportpath = Ops.get_string(entry, "mountpoint", "")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-4.0.1/src/modules/NfsServer.rb new/yast2-nfs-server-4.0.2/src/modules/NfsServer.rb
--- old/yast2-nfs-server-4.0.1/src/modules/NfsServer.rb	2018-07-02 18:05:40.000000000 +0200
+++ new/yast2-nfs-server-4.0.2/src/modules/NfsServer.rb	2018-11-23 12:18:43.000000000 +0100
@@ -19,6 +19,8 @@
 
 module Yast
   class NfsServerClass < Module
+    SERVICE = "nfs-server".freeze
+
     def main
       textdomain "nfs_server"
 
@@ -68,26 +70,31 @@
       @portmapper = "rpcbind"
     end
 
-    # Function sets internal variable, which indicates, that any
-    # settings were modified, to "true"
+    # Sets an internal variable to indicate if settings were modified
     def SetModified
       @modified = true
 
       nil
     end
 
-    # Functions which returns if the settings were modified
-    # @return [Boolean]  settings were modified
+    # Whether the settings were modified
+    #
+    # @return [Boolean]
     def GetModified
       @modified
     end
 
     # Get all NFS server configuration from a map.
-    # When called by nfs_server_auto (preparing autoinstallation data)
-    # the map may be empty.
-    # @param [Hash] settings	$["start_nfsserver": "nfs_exports":]
-    # @return	success
+    #
+    # When called by nfs_server_auto (preparing autoinstallation data) the map may be empty.
+    #
+    # @param [Hash] settings
+    # @option settings [Boolean] start_nfsserver
+    # @option settings [Array] nfs_exports
+    #
     # @see #exports
+    #
+    # @return	[true]
     def Import(settings)
       settings = deep_copy(settings)
       Set(settings)
@@ -95,7 +102,10 @@
     end
 
     # Set the variables just as is and without complaining
-    # @param [Hash] settings $[ start_nfsserver:, nfs_exports:, ]
+    #
+    # @param [Hash] settings
+    # @option settings [Boolean] start_nfsserver
+    # @option settings [Array] nfs_exports
     def Set(settings)
       settings = deep_copy(settings)
       @start = Ops.get_boolean(settings, "start_nfsserver", false)
@@ -109,19 +119,24 @@
       nil
     end
 
-
     # Dump the NFS settings to a map, for autoinstallation use.
-    # @return	$["start_nfsserver": "nfs_exports":]
+    #
     # @see #exports
+    #
+    # @return [Hash] a map with NFS settings, necessary for autoinstallation
+    #   * "start_nfsserver" [Boolean]
+    #   * "nfs_exports" [Array]
     def Export
       { "start_nfsserver" => @start, "nfs_exports" => @exports }
     end
 
-    # Reads NFS settings from the SCR (.etc.exports),
-    # from SCR (.sysnconfig.nfs) and SCR (.etc.idmapd_conf),if necessary.
-    # @return true on success
+    # Reads NFS settings
+    #
+    # From the SCR (.etc.exports), (.sysnconfig.nfs), and (.etc.idmapd_conf) if necessary.
+    #
+    # @return [Boolean] true on success; false otherwise
     def Read
-      @start = Service.Enabled("nfsserver")
+      @start = Service.Enabled(SERVICE)
       @exports = Convert.convert(
         SCR.Read(path(".etc.exports")),
         :from => "any",
@@ -145,6 +160,7 @@
 
 
     # Saves /etc/exports and creates missing directories.
+    #
     # @return true on success
     def WriteExports
       # create missing directories.
@@ -180,8 +196,10 @@
     end
 
     # Saves NFS server configuration. (exports(5))
-    # Creates any missing directories.
-    # @return true on success
+    #
+    # @note It creates any missing directories.
+    #
+    # @return [Boolean] true on success; false otherwise
     def Write
       # if there is still work to do, don't return false immediately
       # but remember the error
@@ -242,9 +260,9 @@
       Progress.NextStage
 
       if !@start
-        Service.Stop("nfsserver") if !@write_only
+        Service.Stop(SERVICE) if !@write_only
 
-        if !Service.Disable("nfsserver")
+        if !Service.Disable(SERVICE)
           Report.Error(Service.Error)
           ok = false
         end
@@ -253,7 +271,7 @@
           Report.Error(Service.Error)
           ok = false
         end
-        if !Service.Enable("nfsserver")
+        if !Service.Enable(SERVICE)
           Report.Error(Service.Error)
           ok = false
         end
@@ -291,9 +309,9 @@
             Service.Start(@portmapper)
           end
 
-          Service.Restart("nfsserver")
+          Service.Restart(SERVICE)
 
-          unless Service.active?("nfsserver")
+          unless Service.active?(SERVICE)
             # error popup message
             Report.Error(
               _(
@@ -314,7 +332,7 @@
       ok
     end
 
-    # @return A summary for autoyast
+    # @return [String] A summary for AutoYaST
     def Summary
       summary = ""
       # summary header; directories exported by NFS
@@ -355,7 +373,10 @@
     end
 
     # Return required packages for auto-installation
-    # @return [Hash] of packages to be installed and to be removed
+    #
+    # @return [Hash] list of packages to be installed or removed
+    #   * "install" [Array] packages to be installed
+    #   * "remove" [Array] an empty array since there is nothing to be removed
     def AutoPackages
       { "install" => @required_packages, "remove" => [] }
     end

    

root

tags

participants (1)