Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 871261 : "Predefined system attribute "installed_product_version" has value "nil' in SLES12 beta3" (RESOLVED/FIXED) ## BNC# 868859 : "Change layout of main steps in installer" (ASSIGNED/) ## BNC# 871158 : "Release notes pauses installing packages" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-04-09 17:04:38.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-04-10 13:22:28.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Apr 10 11:07:13 CEST 2014 - locilka@suse.com + +- Prefering os-release file to content file (which is used only as + a fallback now) both in installation and on a running system + (bnc#871261) +- 3.1.44 + +------------------------------------------------------------------- +Thu Apr 10 09:06:02 UTC 2014 - mvidner@suse.com + +- Enable wizard title on the left instead of on top during the + installation (bnc#868859). +- 3.1.43 + +------------------------------------------------------------------- +Thu Apr 10 08:04:42 UTC 2014 - jsrain@suse.cz + +- adjusted Product.FindBaseProducts to be usable during + installation (needed for fix of bnc#871158) +- 3.1.42 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 73 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:35791 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.41.tar.bz2 New: ---- yast2-3.1.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.K8orUn/_old 2014-04-10 17:21:05.000000000 +0200 +++ /var/tmp/diff_new_pack.K8orUn/_new 2014-04-10 17:21:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.41 +Version: 3.1.44 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.41.tar.bz2 -> yast2-3.1.44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.41/library/packages/src/modules/Product.rb new/yast2-3.1.44/library/packages/src/modules/Product.rb --- old/yast2-3.1.41/library/packages/src/modules/Product.rb 2014-04-09 12:00:12.000000000 +0200 +++ new/yast2-3.1.44/library/packages/src/modules/Product.rb 2014-04-10 13:13:41.000000000 +0200 @@ -93,8 +93,9 @@ Builtins.y2milestone("Looking for base products") products = Pkg.ResolvableProperties("", :product, "") - products = Builtins.filter(products) do |p| - Ops.get_symbol(p, "status", :none) == :installed + expected_status = Stage.initial ? :selected : :installed + products = products.select do |p| + p["status"] == expected_status end Builtins.y2milestone("All found products: %1", products) @@ -111,7 +112,7 @@ Ops.get_string(p, "display_name", "") ) end - Ops.get_string(p, "category", "") == "base" + Stage.initial ? (p["source"] == 0) : (p["category"] == "base") end Builtins.y2milestone("Found base products: %1", products) @@ -161,58 +162,21 @@ nil end - def use_content_file? + def can_use_content_file? FileUtils.Exists(CONTENT_FILE) && !Mode.live_installation end - def use_os_release_file? + def can_use_os_release_file? OSRelease.os_release_exists? end # ----------------------------------------------- # Constructor def Product - if use_content_file? - # it should use the same mechanism as running system. But it would - # mean to initialize package manager from constructor, which is - # not reasonable - @name = SCR.Read(path(".content.LABEL")) - @short_name = SCR.Read(path(".content.SHORTLABEL")) - @short_name ||= @name - @version = SCR.Read(path(".content.VERSION")) - @vendor = SCR.Read(path(".content.VENDOR")) - - @distproduct = SCR.Read(path(".content.DISTPRODUCT")) - @distversion = SCR.Read(path(".content.DISTVERSION")) - - @baseproduct = SCR.Read(path(".content.BASEPRODUCT")) - @baseproduct = @name if @baseproduct == "" - @baseversion = SCR.Read(path(".content.BASEVERSION")) - - @relnotesurl = SCR.Read(path(".content.RELNOTESURL")) - @shortlabel = SCR.Read(path(".content.SHORTLABEL")) - - @flags = (SCR.Read(path(".content.FLAGS")) || "").split - @patterns = (SCR.Read(path(".content.PATTERNS")) || "").split - - # bugzilla #252122, since openSUSE 10.3 - # deprecated: - # content.PATTERNS: abc cba bac - # should re replaced with (and/or) - # content.REQUIRES: pattern:abc pattern:cba pattern:bac - # content.RECOMMENDS: pattern:abc pattern:cba pattern:bac - if @patterns != [] - Builtins.y2warning( - "Product content file contains deprecated PATTERNS tag, use REQUIRES and/or RECOMMENDS instead" - ) - Builtins.y2milestone("PATTERNS: %1", @patterns) - end - # not during testing: Misc::CustomSysconfigRead used by OSRelease creates agent in runtime, - # mocking IniParser not possible - elsif use_os_release_file? - @short_name = OSRelease.ReleaseName - @version = OSRelease.ReleaseVersion - @name = "#{@short_name} #{@version}" + if can_use_os_release_file? + read_os_release_file + elsif can_use_content_file? + read_content_file else raise "Cannot determine the product. Neither from the content, nor the os-relese file" end @@ -232,6 +196,52 @@ nil end + private + + def read_content_file + # it should use the same mechanism as running system. But it would + # mean to initialize package manager from constructor, which is + # not reasonable + @name = SCR.Read(path(".content.LABEL")) + @short_name = SCR.Read(path(".content.SHORTLABEL")) + @short_name ||= @name + + @version = SCR.Read(path(".content.VERSION")) + @vendor = SCR.Read(path(".content.VENDOR")) + + @distproduct = SCR.Read(path(".content.DISTPRODUCT")) + @distversion = SCR.Read(path(".content.DISTVERSION")) + + @baseproduct = SCR.Read(path(".content.BASEPRODUCT")) + @baseproduct = @name if @baseproduct == "" + @baseversion = SCR.Read(path(".content.BASEVERSION")) + + @relnotesurl = SCR.Read(path(".content.RELNOTESURL")) + @shortlabel = SCR.Read(path(".content.SHORTLABEL")) + + @flags = (SCR.Read(path(".content.FLAGS")) || "").split + @patterns = (SCR.Read(path(".content.PATTERNS")) || "").split + + # bugzilla #252122, since openSUSE 10.3 + # deprecated: + # content.PATTERNS: abc cba bac + # should re replaced with (and/or) + # content.REQUIRES: pattern:abc pattern:cba pattern:bac + # content.RECOMMENDS: pattern:abc pattern:cba pattern:bac + if @patterns != [] + Builtins.y2warning( + "Product content file contains deprecated PATTERNS tag, use REQUIRES and/or RECOMMENDS instead" + ) + Builtins.y2milestone("PATTERNS: %1", @patterns) + end + end + + def read_os_release_file + @short_name = OSRelease.ReleaseName + @version = OSRelease.ReleaseVersion + @name = "#{@short_name} #{@version}" + end + publish :variable => :name, :type => "string" publish :variable => :short_name, :type => "string" publish :variable => :version, :type => "string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.41/library/packages/test/product_test.rb new/yast2-3.1.44/library/packages/test/product_test.rb --- old/yast2-3.1.41/library/packages/test/product_test.rb 2014-04-09 12:00:12.000000000 +0200 +++ new/yast2-3.1.44/library/packages/test/product_test.rb 2014-04-10 13:13:41.000000000 +0200 @@ -50,8 +50,8 @@ describe Yast::Product do context "while called in initial installation (content file exists)" do before(:each) do - Yast::Product.stub(:use_content_file?).and_return(true) - Yast::Product.stub(:use_os_release_file?).and_return(false) + Yast::Product.stub(:can_use_content_file?).and_return(true) + Yast::Product.stub(:can_use_os_release_file?).and_return(false) end it "reads product information from content file and fills up internal variables" do @@ -73,8 +73,8 @@ context "while called on a running system (os-release file exists)" do before(:each) do - Yast::Product.stub(:use_content_file?).and_return(false) - Yast::Product.stub(:use_os_release_file?).and_return(true) + Yast::Product.stub(:can_use_content_file?).and_return(false) + Yast::Product.stub(:can_use_os_release_file?).and_return(true) end it "reads product information from OSRelease and fills up internal variables" do @@ -93,11 +93,11 @@ context "while called on a system with both content and os-release files supported" do before(:each) do - Yast::Product.stub(:use_content_file?).and_return(true) - Yast::Product.stub(:use_os_release_file?).and_return(true) + Yast::Product.stub(:can_use_content_file?).and_return(true) + Yast::Product.stub(:can_use_os_release_file?).and_return(true) end - it "prefers content file to os-release file" do + it "prefers os-release file to content file" do load_content_file("SLES_12_Beta4") release_name = "Happy Feet" @@ -107,15 +107,16 @@ Yast::OSRelease.stub(:ReleaseVersion).and_return(release_version) Yast::Product.Product - expect(Yast::Product.short_name).to eq("SUSE Linux Enterprise Server 12") - expect(Yast::Product.short_name).not_to eq(release_name) + expect(Yast::Product.name).to eq("#{release_name} #{release_version}") + expect(Yast::Product.short_name).to eq(release_name) + expect(Yast::Product.short_name).not_to eq("SUSE Linux Enterprise Server 12") end end context "while called on a broken system (neither content nor os-release file exists)" do before(:each) do - Yast::Product.stub(:use_content_file?).and_return(false) - Yast::Product.stub(:use_os_release_file?).and_return(false) + Yast::Product.stub(:can_use_content_file?).and_return(false) + Yast::Product.stub(:can_use_os_release_file?).and_return(false) end it "raises error while reading the product information" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.41/library/wizard/src/modules/Wizard.rb new/yast2-3.1.44/library/wizard/src/modules/Wizard.rb --- old/yast2-3.1.41/library/wizard/src/modules/Wizard.rb 2014-04-09 12:00:12.000000000 +0200 +++ new/yast2-3.1.44/library/wizard/src/modules/Wizard.rb 2014-04-10 13:13:42.000000000 +0200 @@ -617,6 +617,31 @@ end + # Open a dialog with "Back", "Next", "Abort" + # that has the title on the left, as wanted by + # the installation visual design + def OpenLeftTitleNextBackDialog + if haveFancyUI + UI.OpenDialog( + Opt(:wizardDialog), + Wizard( + Opt(:titleOnLeft), + :back, + Label.BackButton, + :abort, + Label.AbortButton, + :next, + Label.NextButton + ) + ) + else + OpenNextBackDialog() + end + + nil + end + + # Open a wizard dialog with simple layout # @@ -1871,6 +1896,7 @@ publish :function => :OpenAcceptStepsDialog, :type => "void ()" publish :function => :OpenAcceptAbortStepsDialog, :type => "void ()" publish :function => :OpenNextBackStepsDialog, :type => "void ()" + publish :function => :OpenLeftTitleNextBackDialog, :type => "void ()" publish :function => :OpenCustomDialog, :type => "void (term, term)" publish :function => :ReplaceCustomHelp, :type => "void (term)" publish :function => :CloseDialog, :type => "void ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.41/package/yast2.changes new/yast2-3.1.44/package/yast2.changes --- old/yast2-3.1.41/package/yast2.changes 2014-04-09 12:00:12.000000000 +0200 +++ new/yast2-3.1.44/package/yast2.changes 2014-04-10 13:13:42.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Thu Apr 10 11:07:13 CEST 2014 - locilka@suse.com + +- Prefering os-release file to content file (which is used only as + a fallback now) both in installation and on a running system + (bnc#871261) +- 3.1.44 + +------------------------------------------------------------------- +Thu Apr 10 09:06:02 UTC 2014 - mvidner@suse.com + +- Enable wizard title on the left instead of on top during the + installation (bnc#868859). +- 3.1.43 + +------------------------------------------------------------------- +Thu Apr 10 08:04:42 UTC 2014 - jsrain@suse.cz + +- adjusted Product.FindBaseProducts to be usable during + installation (needed for fix of bnc#871158) +- 3.1.42 + +------------------------------------------------------------------- Wed Apr 9 07:09:37 UTC 2014 - jsrain@suse.cz - added tabs for release notes into slide show dialog (bnc#871158) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.41/package/yast2.spec new/yast2-3.1.44/package/yast2.spec --- old/yast2-3.1.41/package/yast2.spec 2014-04-09 12:00:12.000000000 +0200 +++ new/yast2-3.1.44/package/yast2.spec 2014-04-10 13:13:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.41 +Version: 3.1.44 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Thu Apr 10 17:21:34 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org