Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2018-01-17 21:41:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client" Wed Jan 17 21:41:49 2018 rev:68 rq:539608 version:4.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2016-06-09 15:59:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes 2018-01-17 21:41:51.317419024 +0100 @@ -1,0 +2,7 @@ +Fri Nov 3 18:20:20 UTC 2017 - [email protected] + +- Fix teststuite once SuSEFirewall2 is being replaced by Firewalld + (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-3.1.17.tar.bz2 New: ---- yast2-nfs-client-4.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.d2VX8Z/_old 2018-01-17 21:41:51.933390191 +0100 +++ /var/tmp/diff_new_pack.d2VX8Z/_new 2018-01-17 21:41:51.937390003 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-client # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.17 +Version: 4.0.0 Release: 0 Url: https://github.com/yast/yast-nfs-client ++++++ yast2-nfs-client-3.1.17.tar.bz2 -> yast2-nfs-client-4.0.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/.rubocop.yml new/yast2-nfs-client-4.0.0/.rubocop.yml --- old/yast2-nfs-client-3.1.17/.rubocop.yml 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/.rubocop.yml 2017-11-07 16:44:07.628457392 +0100 @@ -10,6 +10,9 @@ Metrics/ClassLength: Max: 513 +Metrics/ModuleLength: + Max: 600 + # Offense count: 13 Metrics/CyclomaticComplexity: Max: 31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/.travis.yml new/yast2-nfs-client-4.0.0/.travis.yml --- old/yast2-nfs-client-3.1.17/.travis.yml 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/.travis.yml 2017-11-07 16:44:07.628457392 +0100 @@ -1,17 +1,11 @@ -language: cpp -compiler: - - gcc +sudo: required +language: bash +services: + - docker + before_install: - # disable rvm, use system Ruby - - rvm reset - - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "rspec:3.3.0 yast-rake gettext rubocop:0.29.1" + - docker build -t yast-nfs-client-image . script: - - rake check:syntax - - rake check:pot - - rubocop - - make -f Makefile.cvs - - make - - sudo make install - - make check - + # 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-client-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/CONTRIBUTING.md new/yast2-nfs-client-4.0.0/CONTRIBUTING.md --- old/yast2-nfs-client-3.1.17/CONTRIBUTING.md 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/CONTRIBUTING.md 2017-11-07 16:44:07.628457392 +0100 @@ -3,7 +3,7 @@ YaST is an open source project and as such it welcomes all kinds of contributions. If you decide to contribute, please follow these guidelines to -ensure the process is effective and pleasant both for you and YaST maintainers. +ensure the process is effective and pleasant both for you and the YaST maintainers. There are two main forms of contribution: reporting bugs and performing code changes. @@ -17,13 +17,11 @@ registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) -If you find a problem, please report it either using -[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee -that every bug will be fixed, but we'll try. - When creating a bug report, please follow our [bug reporting guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). +We can't guarantee that every bug will be fixed, but we'll try. + Code Changes ------------ @@ -44,15 +42,22 @@ to the [Ruby style guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). - 4. Make sure your change didn't break anything by building the RPM package + 4. Update the package version (in `packages/*.spec`, usually by + `rake version:bump`) and add a new entry to the `package/*.changes` file + (by `osc vc package`). + For bigger changes or changes which need longer discussion it is advised to + add this as a separate last commit so it can be easily updated when another + change is merged in the meantime. + + 5. Make sure your change didn't break anything by building the RPM package (`rake osc:build`). The build process includes running the full testsuite. - 5. Publish the branch and create a pull request. + 6. Publish the branch and create a pull request. - 6. YaST developers will review your change and possibly point out issues. + 7. YaST developers will review your change and possibly point out issues. Adapt the code under their guidance until they are all resolved. - 7. Finally, the pull request will get merged or rejected. + 8. Finally, the pull request will get merged or rejected. See also [GitHub's guide on contributing](https://help.github.com/articles/fork-a-repo). @@ -60,9 +65,6 @@ If you want to do multiple unrelated changes, use separate branches and pull requests. -Do not change the `VERSION` and `*.changes` files as this could lead to -conflicts. - ### Commits Each commit in the pull request should do only one thing, which is clearly diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/Dockerfile new/yast2-nfs-client-4.0.0/Dockerfile --- old/yast2-nfs-client-3.1.17/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nfs-client-4.0.0/Dockerfile 2017-11-07 16:44:07.628457392 +0100 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/README.md new/yast2-nfs-client-4.0.0/README.md --- old/yast2-nfs-client-3.1.17/README.md 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/README.md 2017-11-07 16:44:07.628457392 +0100 @@ -1,5 +1,7 @@ # YaST - The NFS Client Module # +[](https://coveralls.io/github/yast/yast-nfs-client?branch=master) [](https://travis-ci.org/yast/yast-nfs-client) [](https://ci.opensuse.org/view/Yast/job/yast-nfs-client-master/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/doc/Makefile.am new/yast2-nfs-client-4.0.0/doc/Makefile.am --- old/yast2-nfs-client-3.1.17/doc/Makefile.am 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# -# Makefile.am for nfs-client/doc -# -# $Id$ -# - -htmldir = $(docdir) - -screenshots = \ - nfs-client-*.png \ - abort.png -workflow.png: workflow.dia $(screenshots) - dia --export=$@ $< -MAINTAINERCLEANFILES = workflow.png - -html_DATA = index.html workflow.dia workflow.png $(screenshots) -EXTRA_DIST = $(html_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/doc/index.html new/yast2-nfs-client-4.0.0/doc/index.html --- old/yast2-nfs-client-3.1.17/doc/index.html 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/doc/index.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<html> -<head> -<meta name="generator" content="HTML Tidy, see www.w3.org"> -<title>Network Filesystem (NFS) - YaST2 configuration module</title> -</head> -<body bgcolor="white"> -<h1>Network Filesystem (NFS) - YaST2 configuration module</h1> - -<p>$Id$ -<address><a href="mailto:[email protected]";>Martin Vidner</a></address> - -<h2>Features</h2> - -<p>The NFS config module manages those entries in the mount table -(/etc/fstab) that are of the NFS type. It starts and stops the -necessary init scripts: nfs and portmap. - -<p>A NFS server can be selected from a list of all hosts on the local -network. A mount point can be selected in a browse dialog. The mount -options are syntactically checked. - -<h2>Background Documentation</h2> - -<ul> -<li><a href="man:mount(8)">man mount(8)</a> -<li><a href="man:nfs(5)">man nfs(5)</a> -<li><a -href="http://www.linuxbase.org/spec/gLSB/gLSB/iniscrptact.html";>Linux -Standard Base, Init Script Actions</a> -</ul> - -<h2>Workflow</h2> - -<h3>Changes since SL 7.2</h3> - -<p>The main change is the removal of the first dialog, -which used to have a radio button to enable/disable NFS mounts. -Now disabling NFS mounts is done by leaving the NFS mount table empty. -<p>The button 'New' has been renamed to 'Add' for consistency. -<p>An 'Abort' button has been added. - -<h3>Overview</h3> - -<p><img alt="Workflow overfiew" src="workflow.png"> - -<h3>Individual dialogs</h3> - -<p><img alt="Main NFS client dialog" src="nfs-client-1-fstab-000.png"> -<p><img alt="Editing a table entry" src="nfs-client-1a-edit-000.png"> -<p><img alt="Choosing a server" src="nfs-client-1aa-hosts-000.png"> -<p><img alt="Confirmation" src="nfs-client-2-save-000.png"> - -<h2>Implementation</h2> - -<p><a href="autodocs/">Autodocs</a> - -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/package/yast2-nfs-client.changes new/yast2-nfs-client-4.0.0/package/yast2-nfs-client.changes --- old/yast2-nfs-client-3.1.17/package/yast2-nfs-client.changes 2016-06-06 16:12:08.129923088 +0200 +++ new/yast2-nfs-client-4.0.0/package/yast2-nfs-client.changes 2017-11-07 16:44:07.628457392 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 3 18:20:20 UTC 2017 - [email protected] + +- Fix teststuite once SuSEFirewall2 is being replaced by Firewalld + (fate#323460) +- 4.0.0 + +------------------------------------------------------------------- Mon Jun 6 07:39:33 UTC 2016 - [email protected] - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/package/yast2-nfs-client.spec new/yast2-nfs-client-4.0.0/package/yast2-nfs-client.spec --- old/yast2-nfs-client-3.1.17/package/yast2-nfs-client.spec 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/package/yast2-nfs-client.spec 2017-11-07 16:44:07.628457392 +0100 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 3.1.17 +Version: 4.0.0 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.17/src/clients/nfs-client4part.rb new/yast2-nfs-client-4.0.0/src/clients/nfs-client4part.rb --- old/yast2-nfs-client-3.1.17/src/clients/nfs-client4part.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/clients/nfs-client4part.rb 2017-11-07 16:44:07.632457392 +0100 @@ -62,8 +62,6 @@ if Builtins.contains(@w_ids, Convert.to_symbol(@widget_id)) return ToStorage(@modify_line) - else - return nil end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/src/include/nfs/routines.rb new/yast2-nfs-client-4.0.0/src/include/nfs/routines.rb --- old/yast2-nfs-client-3.1.17/src/include/nfs/routines.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/include/nfs/routines.rb 2017-11-07 16:44:07.632457392 +0100 @@ -107,17 +107,15 @@ Ops.get_string(fse, "file", "") == mpoint end - if Builtins.size(tmp) == 0 - return false - else - # error popup message - Report.Error( - Builtins.sformat( - _("fstab already contains an entry\nwith mount point '%1'."), - mpoint - ) + return false if Builtins.size(tmp) == 0 + + # error popup message + Report.Error( + Builtins.sformat( + _("fstab already contains an entry\nwith mount point '%1'."), + mpoint ) - end + ) true end @@ -150,11 +148,7 @@ # @param [String] p pathname # @return stripped pathname def StripExtraSlash(p) - if Builtins.regexpmatch(p, "^.+/$") - return Builtins.regexpsub(p, "^(.+)/$", "\\1") - else - return p - end + Builtins.regexpmatch(p, "^.+/$") ? Builtins.regexpsub(p, "^(.+)/$", "\\1") : p end # Formats hostname into form suitable for fstab. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/src/include/nfs/ui.rb new/yast2-nfs-client-4.0.0/src/include/nfs/ui.rb --- old/yast2-nfs-client-3.1.17/src/include/nfs/ui.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/include/nfs/ui.rb 2017-11-07 16:44:07.632457392 +0100 @@ -640,7 +640,7 @@ _("Really delete %1?"), Ops.get_string(share, "spec", "") ) - ) + ) @modify_line = deep_copy(share) @nfs_entries = Builtins.remove(@nfs_entries, entryno) UI.ChangeWidget(Id(:fstable), :Items, FstabTableItems(@nfs_entries)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/src/lib/fstab/tsort.rb new/yast2-nfs-client-4.0.0/src/lib/fstab/tsort.rb --- old/yast2-nfs-client-3.1.17/src/lib/fstab/tsort.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/lib/fstab/tsort.rb 2017-11-07 16:44:07.632457392 +0100 @@ -22,8 +22,6 @@ end end - private - # Checks if the first mount point requires the second one to be mounted in # advance def self.dependent_mount_point?(dependent, root) @@ -33,5 +31,7 @@ dependent += "/" unless dependent.end_with?("/") dependent.start_with?(root) end + + private_class_method :dependent_mount_point? end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/src/modules/Nfs.rb new/yast2-nfs-client-4.0.0/src/modules/Nfs.rb --- old/yast2-nfs-client-3.1.17/src/modules/Nfs.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/modules/Nfs.rb 2017-11-07 16:44:07.632457392 +0100 @@ -65,7 +65,7 @@ # Functions which returns if the settings were modified # @return [Boolean] settings were modified - def GetModified # rubocop:disable Style/TrivialAccessors + def GetModified @modified end @@ -355,10 +355,8 @@ Builtins.foreach(@required_packages) do |p| PackagesProposal.AddResolvables("yast2-nfs-client", :package, [p]) end - else - if !PackageSystem.CheckAndInstallPackagesInteractive(@required_packages) - return false - end + elsif !PackageSystem.CheckAndInstallPackagesInteractive(@required_packages) + return false end true @@ -441,64 +439,62 @@ # (No parameters because it is too short to abort) # @return true on success def Write - if WriteOnly() - # dialog label - Progress.New( - _("Writing NFS Configuration"), - " ", - 2, - [ - # progress stage label - _("Stop services"), - # progress stage label - _("Start services") - ], - [ - # progress step label - _("Stopping services..."), - # progress step label - _("Starting services..."), - # final progress step label - _("Finished") - ], - "" - ) + return false unless WriteOnly() - # help text - Wizard.RestoreHelp(_("Writing NFS client settings. Please wait...")) + # dialog label + Progress.New( + _("Writing NFS Configuration"), + " ", + 2, + [ + # progress stage label + _("Stop services"), + # progress stage label + _("Start services") + ], + [ + # progress step label + _("Stopping services..."), + # progress step label + _("Starting services..."), + # final progress step label + _("Finished") + ], + "" + ) + + # help text + Wizard.RestoreHelp(_("Writing NFS client settings. Please wait...")) - Progress.NextStage + Progress.NextStage - Service.Stop("nfs") + Service.Stop("nfs") - Progress.NextStage - if Ops.greater_than(Builtins.size(@nfs_entries), 0) - # 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") - - unless Service.active?("nfs") - # error popup message - Report.Error(_("Unable to mount the NFS entries from /etc/fstab.")) - return false - end + Progress.NextStage + if Ops.greater_than(Builtins.size(@nfs_entries), 0) + # 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 - progress_orig = Progress.set(false) - SuSEFirewall.ActivateConfiguration - Progress.set(progress_orig) + Service.Start("nfs") - Progress.NextStage - return true - else - return false + unless Service.active?("nfs") + # error popup message + Report.Error(_("Unable to mount the NFS entries from /etc/fstab.")) + return false + end end + + progress_orig = Progress.set(false) + SuSEFirewall.ActivateConfiguration + Progress.set(progress_orig) + + Progress.NextStage + true end # Summary() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/src/modules/NfsOptions.rb new/yast2-nfs-client-4.0.0/src/modules/NfsOptions.rb --- old/yast2-nfs-client-3.1.17/src/modules/NfsOptions.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/src/modules/NfsOptions.rb 2017-11-07 16:44:07.632457392 +0100 @@ -49,7 +49,7 @@ "udp", "user", "users" - ] + ].freeze NEGATED_OPTIONS = NEGATABLE_OPTIONS.map { |o| "no#{o}" } @@ -70,7 +70,7 @@ "rw", "silent", "sync" - ] + ].freeze OPTIONS_WITH_VALUE = [ "acdirmax", @@ -102,7 +102,7 @@ "timeo", "vers", "wsize" - ] + ].freeze def main textdomain "nfs" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/testsuite/tests/autoyast.out new/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.out --- old/yast2-nfs-client-3.1.17/testsuite/tests/autoyast.out 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.out 2017-11-07 16:44:07.632457392 +0100 @@ -1,4 +1,5 @@ Read .target.tmpdir "/tmp" +Execute .target.bash "rpm -q --whatprovides firewalld" 1 Dump Nfs::Import Dump - basic, SLE11-SP2 Read .sysconfig.nfs.NFS4_SUPPORT "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-3.1.17/testsuite/tests/autoyast.rb new/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.rb --- old/yast2-nfs-client-3.1.17/testsuite/tests/autoyast.rb 2016-06-06 16:12:08.133923088 +0200 +++ new/yast2-nfs-client-4.0.0/testsuite/tests/autoyast.rb 2017-11-07 16:44:07.632457392 +0100 @@ -6,7 +6,14 @@ Yast.include self, "testsuite.rb" @I_READ = { "target" => { "tmpdir" => "/tmp" } } @I_WRITE = {} - @I_EXEC = {} + # Firewalld rpm not installed + @I_EXEC = { + "target" => { + "bash" => 1, + "bash_output" => { "exit" => 0, "stdout" => "", "stderr" => "" } + } + } + TESTSUITE_INIT([@I_READ, @I_WRITE, @I_EXEC], nil) @READ = {
