Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2017-04-12 17:10:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firewall" Wed Apr 12 17:10:33 2017 rev:53 rq:487043 version:3.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2016-06-10 23:59:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new/yast2-firewall.changes 2017-04-12 17:10:34.995105739 +0200 @@ -1,0 +2,6 @@ +Fri Apr 7 13:51:51 UTC 2017 - [email protected] + +- Inform the user if start/stop/restart fails bsc#962713 +- 3.1.7 + +------------------------------------------------------------------- Old: ---- yast2-firewall-3.1.6.tar.bz2 New: ---- yast2-firewall-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.VXhoW6/_old 2017-04-12 17:10:36.238929662 +0200 +++ /var/tmp/diff_new_pack.VXhoW6/_new 2017-04-12 17:10:36.242929096 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-firewall # -# 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-firewall -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-firewall-3.1.6.tar.bz2 -> yast2-firewall-3.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-3.1.6/.travis.yml new/yast2-firewall-3.1.7/.travis.yml --- old/yast2-firewall-3.1.6/.travis.yml 2016-06-07 12:57:28.982920987 +0200 +++ new/yast2-firewall-3.1.7/.travis.yml 2017-04-10 14:25:02.812754989 +0200 @@ -1,16 +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" + - docker build -t yast-firewall-image . script: - - rake check:syntax - - rake check:pot - - 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-firewall-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-3.1.6/CONTRIBUTING.md new/yast2-firewall-3.1.7/CONTRIBUTING.md --- old/yast2-firewall-3.1.6/CONTRIBUTING.md 2016-06-07 12:57:28.986920987 +0200 +++ new/yast2-firewall-3.1.7/CONTRIBUTING.md 2017-04-10 14:25:02.820754989 +0200 @@ -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-firewall-3.1.6/Dockerfile new/yast2-firewall-3.1.7/Dockerfile --- old/yast2-firewall-3.1.6/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firewall-3.1.7/Dockerfile 2017-04-10 14:25:02.828754989 +0200 @@ -0,0 +1,3 @@ +FROM yastdevel/ruby +COPY . /usr/src/app + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-3.1.6/package/yast2-firewall.changes new/yast2-firewall-3.1.7/package/yast2-firewall.changes --- old/yast2-firewall-3.1.6/package/yast2-firewall.changes 2016-06-07 12:57:28.998920987 +0200 +++ new/yast2-firewall-3.1.7/package/yast2-firewall.changes 2017-04-10 14:25:02.844754989 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 7 13:51:51 UTC 2017 - [email protected] + +- Inform the user if start/stop/restart fails bsc#962713 +- 3.1.7 + +------------------------------------------------------------------- Tue Jun 7 10:37:17 UTC 2016 - [email protected] - Stop generating autodocs (fate#320356) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-3.1.6/package/yast2-firewall.spec new/yast2-firewall-3.1.7/package/yast2-firewall.spec --- old/yast2-firewall-3.1.6/package/yast2-firewall.spec 2016-06-07 12:57:28.998920987 +0200 +++ new/yast2-firewall-3.1.7/package/yast2-firewall.spec 2017-04-10 14:25:02.844754989 +0200 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 3.1.6 +Version: 3.1.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-3.1.6/src/include/firewall/uifunctions.rb new/yast2-firewall-3.1.7/src/include/firewall/uifunctions.rb --- old/yast2-firewall-3.1.6/src/include/firewall/uifunctions.rb 2016-06-07 12:57:29.022920987 +0200 +++ new/yast2-firewall-3.1.7/src/include/firewall/uifunctions.rb 2017-04-10 14:25:02.868754989 +0200 @@ -123,7 +123,7 @@ Wizard.CreateDialog Wizard.RestoreHelp(HelpForDialog("saving_configuration")) success = SuSEFirewall.SaveAndRestartService - SuSEFirewall.SetStartService(true) if success + success ? SuSEFirewall.SetStartService(true) : report_problem(:start) Builtins.sleep(500) UI.CloseDialog @@ -135,10 +135,11 @@ def StartNow UI.OpenDialog(Label(_("Starting firewall..."))) SuSEFirewall.SetStartService(true) - ret = SuSEFirewall.StartServices + success = SuSEFirewall.StartServices + report_problem(:start) unless success UI.CloseDialog - ret + success end # Function stops Firewall services and sets firewall @@ -146,10 +147,30 @@ def StopNow UI.OpenDialog(Label(_("Stopping firewall..."))) SuSEFirewall.SetStartService(false) - ret = SuSEFirewall.StopServices + success = SuSEFirewall.StopServices + report_problem(:stop) unless success UI.CloseDialog - ret + success + end + + def report_problem(action) + action_str = case action + when :stop + # TRANSLATORS: action which failed, used later + _("The firewall could not be stopped.") + when :start + # TRANSLATORS: action which failed, used later + _("The firewall could not be started.") + else + raise "invalid action #{action}" + end + # TRANSLATORS: %s is action that failed + msg = _( + "%s\n" + + "Please verify your system and try again." + ) % action_str + Popup.Error(msg) end # Function sets appropriate states for [Change] and [Custom] buttons
