Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-07-31 21:49:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-07-30 07:35:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-07-31 21:49:05.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Jul 30 07:50:20 UTC 2014 - lsle...@suse.cz + +- fixed a crash in package management when running in Qt UI with + libproxy1-config-kde4 package installed (bnc#866692) +- 3.1.92 + +------------------------------------------------------------------- +Wed Jul 30 09:13:36 CEST 2014 - loci...@suse.com + +- Fixed setting the default target during installation - systemctl + doesn't return any target properties while running in chroot so + we have to guess the Id and AllowIsolate properties (bnc#889323) +- 3.1.91 + +------------------------------------------------------------------- Old: ---- yast2-3.1.90.tar.bz2 New: ---- yast2-3.1.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.mTCEtL/_old 2014-07-31 21:49:06.000000000 +0200 +++ /var/tmp/diff_new_pack.mTCEtL/_new 2014-07-31 21:49:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.90 +Version: 3.1.92 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.90.tar.bz2 -> yast2-3.1.92.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.90/library/systemd/src/modules/systemd_target.rb new/yast2-3.1.92/library/systemd/src/modules/systemd_target.rb --- old/yast2-3.1.90/library/systemd/src/modules/systemd_target.rb 2014-07-29 16:02:44.000000000 +0200 +++ new/yast2-3.1.92/library/systemd/src/modules/systemd_target.rb 2014-07-30 10:27:42.000000000 +0200 @@ -42,6 +42,8 @@ end class SystemdTargetClass < Module + include Yast::Logger + UNIT_SUFFIX = ".target" DEFAULT_TARGET = "default.target" PROPERTIES = { :allow_isolate => "AllowIsolate" } @@ -49,7 +51,12 @@ def find target_name, properties={} target_name += UNIT_SUFFIX unless target_name.end_with?(UNIT_SUFFIX) target = Target.new(target_name, PROPERTIES.merge(properties)) - return nil if target.properties.not_found? + + if target.properties.not_found? + log.error "Target #{target_name} not found: #{target.properties.inspect}" + return nil + end + target end @@ -73,7 +80,12 @@ def set_default target target_unit = target.is_a?(Target) ? target : find(target) - return false unless target_unit + + unless target_unit + log.error "Cannot find target #{target.inspect}" + return false + end + target_unit.set_default end @@ -83,13 +95,22 @@ undef_method :start, :stop, :enable, :disable, :restart def allow_isolate? - properties.allow_isolate == 'yes' + # We cannot find out a target properties from /mnt in inst-sys + # systemctl doesn't return any properties in chroot + # See bnc#889323 + ['yes', nil].include?(properties.allow_isolate) end def set_default - return false unless allow_isolate? + unless allow_isolate? + log.error "Cannot set #{id.inspect} as default target: Cannot be isolated (#{properties.allow_isolate})" + return false + end + + # Constructing a fallback target ID if we can't get it from systemctl + target_name = id ? id : "#{name}.target" - result = Systemctl.execute("set-default --force " << id) + result = Systemctl.execute("set-default --force #{target_name}") result.exit.zero? end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.90/library/systemd/test/systemd_target_test.rb new/yast2-3.1.92/library/systemd/test/systemd_target_test.rb --- old/yast2-3.1.90/library/systemd/test/systemd_target_test.rb 2014-07-29 16:02:44.000000000 +0200 +++ new/yast2-3.1.92/library/systemd/test/systemd_target_test.rb 2014-07-30 10:27:42.000000000 +0200 @@ -99,6 +99,16 @@ target = SystemdTarget.find("network") expect(target.set_default).to be_false end + + context "when target properties cannot be found out (e.g. in chroot)" do + it "it returns true if the target unit object has been set as default target" do + expect(Systemctl).to receive(:execute).with("set-default --force multi-user-in-installation.target") + .and_return(OpenStruct.new('exit'=>0, 'stdout'=>'', 'stderr'=>'')) + stub_targets(:target=>"multi-user-in-installation") + target = SystemdTarget.find("multi-user-in-installation") + expect(target.set_default).to be_true + end + end end describe "#allow_isolate?" do @@ -112,6 +122,14 @@ target = SystemdTarget.find("network") expect(target.allow_isolate?).to be_false end + + context "when target properties cannot be found out (e.g. in chroot)" do + it "returns true" do + stub_targets(:target=>"multi-user-in-installation") + target = SystemdTarget.find("multi-user-in-installation") + expect(target.allow_isolate?).to be_true + end + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.90/package/yast2.changes new/yast2-3.1.92/package/yast2.changes --- old/yast2-3.1.90/package/yast2.changes 2014-07-29 16:02:44.000000000 +0200 +++ new/yast2-3.1.92/package/yast2.changes 2014-07-30 10:27:42.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Jul 30 07:50:20 UTC 2014 - lsle...@suse.cz + +- fixed a crash in package management when running in Qt UI with + libproxy1-config-kde4 package installed (bnc#866692) +- 3.1.92 + +------------------------------------------------------------------- +Wed Jul 30 09:13:36 CEST 2014 - loci...@suse.com + +- Fixed setting the default target during installation - systemctl + doesn't return any target properties while running in chroot so + we have to guess the Id and AllowIsolate properties (bnc#889323) +- 3.1.91 + +------------------------------------------------------------------- Tue Jul 29 13:30:04 UTC 2014 - jreidin...@suse.com - Fix timing of slideshow - now slides goes in cycle and all have diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.90/package/yast2.spec new/yast2-3.1.92/package/yast2.spec --- old/yast2-3.1.90/package/yast2.spec 2014-07-29 16:02:44.000000000 +0200 +++ new/yast2-3.1.92/package/yast2.spec 2014-07-30 10:27:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.90 +Version: 3.1.92 Release: 0 URL: https://github.com/yast/yast-yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.90/scripts/yast2 new/yast2-3.1.92/scripts/yast2 --- old/yast2-3.1.90/scripts/yast2 2014-07-29 16:02:44.000000000 +0200 +++ new/yast2-3.1.92/scripts/yast2 2014-07-30 10:27:42.000000000 +0200 @@ -19,9 +19,15 @@ unset GEM_HOME GEM_PATH RUBYLIB RUBYPATH RUBYOPT # we need input methods for many locales bnc#776567 - export QT_IM_MODULE=xim GTK_IM_MODULE=xim +# Do not load libproxy modules (config_kde4 module crashes because of Qt4/Qt5 +# clash), empty path causes that the installed modules are not found. Sysconfig +# and envvar extensions are still loaded, /etc/sysconfig/proxy values are still +# used correctly (see bnc#866692 for details). +export PX_MODULE_PATH="" + + # allow for a different prefix # strip the basename off $0, which can be: (bnc#382216, bnc#458385) # /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin/yast2 (PATH=/sbin/:...) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
