Hello community, here is the log from the commit of package yast2-services-manager for openSUSE:Factory checked in at 2015-12-01 09:18:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-services-manager (Old) and /work/SRC/openSUSE:Factory/.yast2-services-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-services-manager/yast2-services-manager.changes 2014-12-25 23:20:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-services-manager.new/yast2-services-manager.changes 2015-12-01 09:18:32.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 25 00:20:00 CST 2015 - crojasaragonez@hotmail.com + +- Closing window with x icon fixed (bsc#956917) +- 3.1.41 + +------------------------------------------------------------------- +Mon Nov 23 09:50:44 CET 2015 - locilka@suse.com + +- Service state 'activating' is considered to be 'active', + 'deactivating' is 'inactive' and 'reloading' is 'active'. + This fixes the second stage of AutoYaST installation getting hung + in certain cases as it tried to restart itself (bsc#956043). +- 3.1.40 + +------------------------------------------------------------------- @@ -5,0 +21 @@ +- 3.1.39 Old: ---- yast2-services-manager-3.1.39.tar.bz2 New: ---- yast2-services-manager-3.1.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.Mn0OmB/_old 2015-12-01 09:18:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Mn0OmB/_new 2015-12-01 09:18:33.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-services-manager # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.39 +Version: 3.1.41 Release: 0 BuildArch: noarch ++++++ yast2-services-manager-3.1.39.tar.bz2 -> yast2-services-manager-3.1.41.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/.travis.yml new/yast2-services-manager-3.1.41/.travis.yml --- old/yast2-services-manager-3.1.39/.travis.yml 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/.travis.yml 2015-11-27 09:42:03.000000000 +0100 @@ -5,7 +5,7 @@ # disable rvm, use system Ruby - rvm reset - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tra... - - sh ./travis_setup.sh -p "rake yast2 yast2-devtools" -g "rspec:2.14.1 yast-rake yard gettext" + - sh ./travis_setup.sh -p "rake yast2 yast2-devtools" -g "rspec:3.3.0 yast-rake yard gettext" script: - rake check:syntax - rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/CONTRIBUTING.md new/yast2-services-manager-3.1.41/CONTRIBUTING.md --- old/yast2-services-manager-3.1.39/CONTRIBUTING.md 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/CONTRIBUTING.md 2015-11-27 09:42:03.000000000 +0100 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified 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.novell.com/) or GitHub issues. We can't guarantee +[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 @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#references) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/package/yast2-services-manager.changes new/yast2-services-manager-3.1.41/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.39/package/yast2-services-manager.changes 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/package/yast2-services-manager.changes 2015-11-27 09:42:03.000000000 +0100 @@ -1,8 +1,24 @@ ------------------------------------------------------------------- +Wed Nov 25 00:20:00 CST 2015 - crojasaragonez@hotmail.com + +- Closing window with x icon fixed (bsc#956917) +- 3.1.41 + +------------------------------------------------------------------- +Mon Nov 23 09:50:44 CET 2015 - locilka@suse.com + +- Service state 'activating' is considered to be 'active', + 'deactivating' is 'inactive' and 'reloading' is 'active'. + This fixes the second stage of AutoYaST installation getting hung + in certain cases as it tried to restart itself (bsc#956043). +- 3.1.40 + +------------------------------------------------------------------- Fri Dec 19 12:14:11 CET 2014 - schubi@suse.de - AutoYaST: Moved code from autoyast2 package to import function of services_manager_target. (bnc#909745) +- 3.1.39 ------------------------------------------------------------------- Wed Dec 17 12:18:46 CET 2014 - schubi@suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/package/yast2-services-manager.spec new/yast2-services-manager-3.1.41/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.39/package/yast2-services-manager.spec 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/package/yast2-services-manager.spec 2015-11-27 09:42:03.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.39 +Version: 3.1.41 Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/src/clients/services-manager.rb new/yast2-services-manager-3.1.41/src/clients/services-manager.rb --- old/yast2-services-manager-3.1.39/src/clients/services-manager.rb 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/src/clients/services-manager.rb 2015-11-27 09:42:03.000000000 +0100 @@ -64,7 +64,7 @@ Builtins.y2milestone('User returned %1', input) case input - when :abort + when :abort, :cancel break if Popup::ReallyAbort(ServicesManager.modified?) # Default for double-click in the table when Id::TOGGLE_ENABLED, Id::SERVICES_TABLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.41/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.39/src/modules/services_manager_service.rb 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/src/modules/services_manager_service.rb 2015-11-27 09:42:03.000000000 +0100 @@ -24,11 +24,13 @@ } module Status - LOADED = 'loaded' - ACTIVE = 'active' - INACTIVE = 'inactive' - ENABLED = 'enabled' - DISABLED = 'disabled' + LOADED = 'loaded' + ACTIVE = 'active' + ACTIVATING = 'activating' + RELOADING = 'reloading' + INACTIVE = 'inactive' + ENABLED = 'enabled' + DISABLED = 'disabled' SUPPORTED_STATES = [ENABLED, DISABLED] end @@ -84,7 +86,13 @@ service.chomp! SERVICE_SUFFIX units[service] = { :status => status, - :active => active == Status::ACTIVE, + # bsc#956043 service can be 'just being activated' or 'reloaded' + # See https://github.com/systemd/systemd/blob/7152869f0a4a4612022244064cc2b3905b1e... + :active => ( + active == Status::ACTIVE || + active == Status::ACTIVATING || + active == Status::RELOADING + ), :description => description.join(' ') } end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.39/test/services_manager_service_test.rb new/yast2-services-manager-3.1.41/test/services_manager_service_test.rb --- old/yast2-services-manager-3.1.39/test/services_manager_service_test.rb 2014-12-22 16:16:12.000000000 +0100 +++ new/yast2-services-manager-3.1.41/test/services_manager_service_test.rb 2015-11-27 09:42:03.000000000 +0100 @@ -23,7 +23,10 @@ 'stdout'=> "sshd.service enabled \n" + "postfix.service disabled\n " + "swap.service masked \n" + - "dbus.service static \n", + "dbus.service static \n" + + "xbus.service enabled \n" + + "ybus.service enabled \n" + + "zbus.service enabled \n", 'stderr' => '', 'exit' => 0 }) @@ -32,7 +35,10 @@ .and_return({ 'stdout'=>"sshd.service loaded active running OpenSSH Daemon\n" + "postfix.service loaded inactive dead Postfix Mail Agent\n" + - "dbus.service loaded active running D-Bus System Message Bus", + "dbus.service loaded active running D-Bus System Message Bus\n" + + "xbus.service loaded activating start start YaST2 Second Stage (1)\n" + + "ybus.service loaded deactivating stop start YaST2 Second Stage (2)\n" + + "zbus.service loaded reloading stop start YaST2 Second Stage (3)\n", 'stderr' => '', 'exit' => 0 }) @@ -166,5 +172,29 @@ expect(service.errors.size).to eq 1 end end + + context "when service is in state 'activating'" do + it "is considered to be active" do + stub_services + xbus_service = service.all['xbus'] + expect(xbus_service[:active]).to eq(true) + end + end + + context "when service is in state 'deactivating'" do + it "is considered to be inactive" do + stub_services + ybus_service = service.all['ybus'] + expect(ybus_service[:active]).to eq(false) + end + end + + context "when service is in state 'reloading'" do + it "is considered to be active" do + stub_services + zbus_service = service.all['zbus'] + expect(zbus_service[:active]).to eq(true) + end + end end end