Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-07-15 16:25:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02 15:04:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-07-15 16:25:55.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Jul 10 12:56:20 UTC 2014 - [email protected] + +- Product.rb: do not stop initialization on solver errors + (bnc#886588) +- 3.1.85 + +------------------------------------------------------------------- +Tue Jul 8 15:49:43 CEST 2014 - [email protected] + +- Fixed Product.get_property by ensuring that we don't try to get + property of an undefined product (bnc#886151) +- 3.1.84 + +------------------------------------------------------------------- +Fri Jul 4 15:45:38 UTC 2014 - [email protected] + +- view_anymsg: remove escape sequences from input log file + (bnc#879629) +- 3.1.83 + +------------------------------------------------------------------- Old: ---- yast2-3.1.82.tar.bz2 New: ---- yast2-3.1.85.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.O5gLcO/_old 2014-07-15 16:25:56.000000000 +0200 +++ /var/tmp/diff_new_pack.O5gLcO/_new 2014-07-15 16:25:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.82 +Version: 3.1.85 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.82.tar.bz2 -> yast2-3.1.85.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.82/library/packages/src/modules/Product.rb new/yast2-3.1.85/library/packages/src/modules/Product.rb --- old/yast2-3.1.82/library/packages/src/modules/Product.rb 2014-07-01 11:12:25.000000000 +0200 +++ new/yast2-3.1.85/library/packages/src/modules/Product.rb 2014-07-10 15:27:28.000000000 +0200 @@ -86,10 +86,10 @@ :vendor, :dist, :distproduct, :distversion, :shortlabel ] - # Returns list of selected (installation) or installed (running system) + # Returns list Hashes of selected (installation) or installed (running system) # base products got from libzypp # - # @return [Hash] products + # @return [Array <Hash>] with product definitions def FindBaseProducts return unless load_zypp @@ -165,6 +165,8 @@ end # Ensures that we can load data from libzypp + # @return [Boolean] false if libzypp lock cannot be obtained, otherwise true + # (solver errors are ignored, see bnc#886588) def load_zypp if !PackageLock.Check Builtins.y2error("Packager is locked, can't read product info!") @@ -178,6 +180,9 @@ end Pkg.PkgSolve(true) + + # ignore solver errors + true end # Reads basic product information from os-release file @@ -232,6 +237,7 @@ # # @param [Symbol] key def get_property(key) + @product ||= {} @product[key] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.82/library/packages/test/product_test.rb new/yast2-3.1.85/library/packages/test/product_test.rb --- old/yast2-3.1.82/library/packages/test/product_test.rb 2014-07-01 11:12:25.000000000 +0200 +++ new/yast2-3.1.85/library/packages/test/product_test.rb 2014-07-10 15:27:28.000000000 +0200 @@ -192,6 +192,17 @@ end end + describe "#FindBaseProducts" do + it "reads data from zypp and returns list of base products selected for installation" do + list_of_products = Yast::Product.FindBaseProducts + + expect(list_of_products).to be_a_kind_of(Array) + expect(list_of_products[0]).to be_a_kind_of(Hash) + expect(list_of_products[0]["display_name"]).to eq("openSUSE (SELECTED)") + expect(list_of_products[0]["status"]).to eq(:selected) + end + end + it "reports that method has been dropped" do [:vendor, :dist, :distproduct, :distversion, :shortlabel].each do |method_name| expect{ Yast::Product.send(method_name) }.to raise_error(/#{method_name}.*dropped/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.82/library/system/src/clients/view_anymsg.rb new/yast2-3.1.85/library/system/src/clients/view_anymsg.rb --- old/yast2-3.1.82/library/system/src/clients/view_anymsg.rb 2014-07-01 11:12:25.000000000 +0200 +++ new/yast2-3.1.85/library/system/src/clients/view_anymsg.rb 2014-07-10 15:27:28.000000000 +0200 @@ -187,6 +187,12 @@ file_content = _("File not found.") end + # remove ANSI color escape sequences + file_content.gsub!(/\e\[(\d|;|\[)+m/, "") + # remove remaining ASCII control characters (ASCII 0-31 and 127 (DEL)) + # (except new line, CR = 0xd) + file_content.tr!("\u0000-\u000c\u000e-\u001f\u007f", "") + # Fill the LogView with file content UI.ChangeWidget(Id(:log), :Value, file_content) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.82/package/yast2.changes new/yast2-3.1.85/package/yast2.changes --- old/yast2-3.1.82/package/yast2.changes 2014-07-01 11:12:25.000000000 +0200 +++ new/yast2-3.1.85/package/yast2.changes 2014-07-10 15:27:28.000000000 +0200 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Thu Jul 10 12:56:20 UTC 2014 - [email protected] + +- Product.rb: do not stop initialization on solver errors + (bnc#886588) +- 3.1.85 + +------------------------------------------------------------------- +Tue Jul 8 15:49:43 CEST 2014 - [email protected] + +- Fixed Product.get_property by ensuring that we don't try to get + property of an undefined product (bnc#886151) +- 3.1.84 + +------------------------------------------------------------------- +Fri Jul 4 15:45:38 UTC 2014 - [email protected] + +- view_anymsg: remove escape sequences from input log file + (bnc#879629) +- 3.1.83 + +------------------------------------------------------------------- Tue Jul 1 09:00:51 UTC 2014 - [email protected] - Fix SystemdTarget.all not to return nil in the collection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.82/package/yast2.spec new/yast2-3.1.85/package/yast2.spec --- old/yast2-3.1.82/package/yast2.spec 2014-07-01 11:12:25.000000000 +0200 +++ new/yast2-3.1.85/package/yast2.spec 2014-07-10 15:27:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.82 +Version: 3.1.85 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
