Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-05-10 22:56:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-06 13:40:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-05-10 22:57:02.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 9 07:15:25 UTC 2014 - [email protected] + +- Product.rb - fixed base product detection (do not check the + product status, always use the product from the initial + repository during installation) (bnc#876836) +- 3.1.61 + +------------------------------------------------------------------- Old: ---- yast2-3.1.60.tar.bz2 New: ---- yast2-3.1.61.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.ElCVzd/_old 2014-05-10 22:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.ElCVzd/_new 2014-05-10 22:57:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.60 +Version: 3.1.61 Release: 0 Url: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.60.tar.bz2 -> yast2-3.1.61.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.60/library/packages/src/modules/Product.rb new/yast2-3.1.61/library/packages/src/modules/Product.rb --- old/yast2-3.1.60/library/packages/src/modules/Product.rb 2014-05-05 13:57:50.000000000 +0200 +++ new/yast2-3.1.61/library/packages/src/modules/Product.rb 2014-05-09 11:02:42.000000000 +0200 @@ -95,17 +95,19 @@ log.info "Looking for base products" - products = Pkg.ResolvableProperties("", :product, "").dup || [] - required_status = use_installed_products? ? :installed : :selected - products.select!{ |p| p["status"] == required_status } - - log.info "All #{required_status} products: #{products}" + products = Pkg.ResolvableProperties("", :product, "") || [] # For all (not only base) products - fill_up_relnotes(products) + # TODO FIXME: filling release notes is a nasty side effect of searching the base product, + # it should be handled separately... + required_status = use_installed_products? ? :installed : :selected + fill_up_relnotes(products.select{ |p| p["status"] == required_status }) # Use only base products products.select! do |p| + # The category "base" is not set during installation yet, it is set + # only for _installed_ base product (otherwise "addon" is reported). + # Use the product from the initial repository during installation. use_installed_products? ? (p["category"] == "base") : (p["source"] == 0) end @@ -113,7 +115,7 @@ if products.empty? log.error "No base product found" - raise "No #{required_status} base product found" + raise "No base product found" elsif products.size > 1 log.warn "More than one base product found!" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.60/library/packages/test/product_test.rb new/yast2-3.1.61/library/packages/test/product_test.rb --- old/yast2-3.1.60/library/packages/test/product_test.rb 2014-05-05 13:57:50.000000000 +0200 +++ new/yast2-3.1.61/library/packages/test/product_test.rb 2014-05-09 11:02:42.000000000 +0200 @@ -288,7 +288,7 @@ SUPPORTED_METHODS.each do |method_name| log.info "Yast::Product.#{method_name}" - expect{ Yast::Product.send(method_name) }.to raise_error(/no selected base product found/i) + expect{ Yast::Product.send(method_name) }.to raise_error(/no base product found/i) end SUPPORTED_METHODS_ALLOWED_EMPTY.each do |method_name| @@ -305,7 +305,7 @@ SUPPORTED_METHODS.each do |method_name| log.info "Yast::Product.#{method_name}" - expect{ Yast::Product.send(method_name) }.to raise_error(/no installed base product found/i) + expect{ Yast::Product.send(method_name) }.to raise_error(/no base product found/i) end SUPPORTED_METHODS_ALLOWED_EMPTY.each do |method_name| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.60/package/yast2.changes new/yast2-3.1.61/package/yast2.changes --- old/yast2-3.1.60/package/yast2.changes 2014-05-05 13:57:50.000000000 +0200 +++ new/yast2-3.1.61/package/yast2.changes 2014-05-09 11:02:42.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri May 9 07:15:25 UTC 2014 - [email protected] + +- Product.rb - fixed base product detection (do not check the + product status, always use the product from the initial + repository during installation) (bnc#876836) +- 3.1.61 + +------------------------------------------------------------------- Mon May 5 11:38:34 UTC 2014 - [email protected] - Fix getting the status of sysvinit services (bnc#876144) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.60/package/yast2.spec new/yast2-3.1.61/package/yast2.spec --- old/yast2-3.1.60/package/yast2.spec 2014-05-05 13:57:50.000000000 +0200 +++ new/yast2-3.1.61/package/yast2.spec 2014-05-09 11:02:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.60 +Version: 3.1.61 Release: 0 URL: https://github.com/yast/yast-yast2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
