Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-03-11 18:01:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Sun Mar 11 18:01:55 2018 rev:238 rq:583773 version:4.0.38 Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2018-03-07 10:29:50.656939161 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2018-03-11 18:01:57.110059968 +0100 @@ -1,0 +2,6 @@ +Wed Mar 7 08:06:05 UTC 2018 - [email protected] + +- Fixed cloning of the base product name (bsc#1084259) +- 4.0.38 + +------------------------------------------------------------------- Old: ---- autoyast2-4.0.37.tar.bz2 New: ---- autoyast2-4.0.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.3c9yDs/_old 2018-03-11 18:01:57.850033440 +0100 +++ /var/tmp/diff_new_pack.3c9yDs/_new 2018-03-11 18:01:57.854033297 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.37 +Version: 4.0.38 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-4.0.37.tar.bz2 -> autoyast2-4.0.38.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/package/autoyast2.changes new/autoyast2-4.0.38/package/autoyast2.changes --- old/autoyast2-4.0.37/package/autoyast2.changes 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/package/autoyast2.changes 2018-03-07 10:49:57.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 7 08:06:05 UTC 2018 - [email protected] + +- Fixed cloning of the base product name (bsc#1084259) +- 4.0.38 + +------------------------------------------------------------------- Mon Mar 5 16:13:36 CET 2018 - [email protected] - Fix in showing/accepting base licenses: Using diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/package/autoyast2.spec new/autoyast2-4.0.38/package/autoyast2.spec --- old/autoyast2-4.0.37/package/autoyast2.spec 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/package/autoyast2.spec 2018-03-07 10:49:57.000000000 +0100 @@ -22,7 +22,7 @@ %endif Name: autoyast2 -Version: 4.0.37 +Version: 4.0.38 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/src/modules/AutoinstFunctions.rb new/autoyast2-4.0.38/src/modules/AutoinstFunctions.rb --- old/autoyast2-4.0.37/src/modules/AutoinstFunctions.rb 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/src/modules/AutoinstFunctions.rb 2018-03-07 10:49:57.000000000 +0100 @@ -165,7 +165,7 @@ # the criteria, nil otherwise def identify_product_by_selection(profile) identify_product do |product| - product.short_name == base_product_name(profile) + product.name == base_product_name(profile) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/src/modules/AutoinstSoftware.rb new/autoyast2-4.0.38/src/modules/AutoinstSoftware.rb --- old/autoyast2-4.0.37/src/modules/AutoinstSoftware.rb 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/src/modules/AutoinstSoftware.rb 2018-03-07 10:49:57.000000000 +0100 @@ -698,7 +698,7 @@ products = Product.FindBaseProducts raise "Found multiple base products" if products.size > 1 - s["products"] = products.map{ |x| x["short_name"] } + s["products"] = products.map{ |x| x["name"] } s end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/test/AutoinstFunctions_test.rb new/autoyast2-4.0.38/test/AutoinstFunctions_test.rb --- old/autoyast2-4.0.37/test/AutoinstFunctions_test.rb 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/test/AutoinstFunctions_test.rb 2018-03-07 10:49:57.000000000 +0100 @@ -110,19 +110,19 @@ end describe "#selected_product" do - def base_product(name, short_name) - Y2Packager::Product.new(name: name, short_name: short_name) + def base_product(name) + Y2Packager::Product.new(name: name) end - let(:selected_name) { "SLES15" } + let(:selected_name) { "SLES" } before(:each) do allow(Y2Packager::Product) .to receive(:available_base_products) .and_return( [ - base_product("SLES", selected_name), - base_product("SLED", "SLED15") + base_product("SLES"), + base_product("SLED") ] ) @@ -135,7 +135,7 @@ .to receive(:current) .and_return("software" => { "products" => [selected_name] }) - expect(subject.selected_product.short_name).to eql selected_name + expect(subject.selected_product.name).to eql selected_name end it "returns nil when product is explicitly selected in the profile and such base product doesn't exist on media" do @@ -151,7 +151,7 @@ .to receive(:current) .and_return("software" => { "patterns" => ["sles-base-32bit"] }) - expect(subject.selected_product.short_name).to eql selected_name + expect(subject.selected_product.name).to eql selected_name end it "returns base product identified by packages in the profile if such base product exists on media" do @@ -159,7 +159,7 @@ .to receive(:current) .and_return("software" => { "packages" => ["sles-release"] }) - expect(subject.selected_product.short_name).to eql selected_name + expect(subject.selected_product.name).to eql selected_name end it "returns base product if there is just one on media and product cannot be identified from profile" do @@ -167,14 +167,14 @@ .to receive(:available_base_products) .and_return( [ - base_product("SLED", "SLED15") + base_product("SLED") ] ) allow(Yast::Profile) .to receive(:current) .and_return("software" => {}) - expect(subject.selected_product.short_name).to eql "SLED15" + expect(subject.selected_product.name).to eql "SLED" end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.37/test/AutoinstSoftware_test.rb new/autoyast2-4.0.38/test/AutoinstSoftware_test.rb --- old/autoyast2-4.0.37/test/AutoinstSoftware_test.rb 2018-03-06 11:57:37.000000000 +0100 +++ new/autoyast2-4.0.38/test/AutoinstSoftware_test.rb 2018-03-07 10:49:57.000000000 +0100 @@ -32,7 +32,7 @@ it "puts product definition into the exported profile" do expect(Yast::Product) .to receive(:FindBaseProducts) - .and_return([{ "short_name" => "LeanOS" }]) + .and_return([{ "name" => "LeanOS" }]) profile = subject.Export @@ -45,8 +45,8 @@ .to receive(:FindBaseProducts) .and_return( [ - { "short_name" => "LeanOS" }, - { "short_name" => "AgileOS" } + { "name" => "LeanOS" }, + { "name" => "AgileOS" } ] )
