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-registration -> sle12 ## BNC# 883206 : "Predecessor information for products, extensions, and modules." (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-registration/yast2-registration.changes 2014-07-03 18:03:43.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-registration/yast2-registration.changes 2014-07-04 10:55:26.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 4 07:55:33 UTC 2014 - lslezak@suse.cz + +- check also the previous product name to handle addon/extension + renames (bnc#883206) +- 3.1.84 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-registration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-registration (Old) and /mounts/work_src_done/SLE12/yast2-registration (BS:build ID:40708 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-registration", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-registration-3.1.83.tar.bz2 New: ---- yast2-registration-3.1.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.OXelAx/_old 2014-07-04 15:56:04.000000000 +0200 +++ /var/tmp/diff_new_pack.OXelAx/_new 2014-07-04 15:56:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.83 +Version: 3.1.84 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-registration-3.1.83.tar.bz2 -> yast2-registration-3.1.84.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.83/package/yast2-registration.changes new/yast2-registration-3.1.84/package/yast2-registration.changes --- old/yast2-registration-3.1.83/package/yast2-registration.changes 2014-07-03 15:35:35.000000000 +0200 +++ new/yast2-registration-3.1.84/package/yast2-registration.changes 2014-07-04 10:52:42.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 4 07:55:33 UTC 2014 - lslezak@suse.cz + +- check also the previous product name to handle addon/extension + renames (bnc#883206) +- 3.1.84 + +------------------------------------------------------------------- Thu Jul 3 13:03:49 UTC 2014 - lslezak@suse.cz - improved user visible texts (bnc#883769) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.83/package/yast2-registration.spec new/yast2-registration-3.1.84/package/yast2-registration.spec --- old/yast2-registration-3.1.83/package/yast2-registration.spec 2014-07-03 15:35:35.000000000 +0200 +++ new/yast2-registration-3.1.84/package/yast2-registration.spec 2014-07-04 10:52:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-registration -Version: 3.1.83 +Version: 3.1.84 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.83/src/lib/registration/addon.rb new/yast2-registration-3.1.84/src/lib/registration/addon.rb --- old/yast2-registration-3.1.83/src/lib/registration/addon.rb 2014-07-03 15:35:36.000000000 +0200 +++ new/yast2-registration-3.1.84/src/lib/registration/addon.rb 2014-07-04 10:52:42.000000000 +0200 @@ -135,8 +135,11 @@ @pure_addon.available != false end + # Checks whether this addon updates an old addon + # @param [Hash] old_addon addon Hash received from pkg-bindings + # @return [Boolean] true if it updates the old addon, false otherwise def updates_addon?(old_addon) - old_addon["name"] == identifier + old_addon["name"] == identifier || old_addon["name"] == @pure_addon.former_identifier end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.83/test/addon_spec.rb new/yast2-registration-3.1.84/test/addon_spec.rb --- old/yast2-registration-3.1.83/test/addon_spec.rb 2014-07-03 15:35:36.000000000 +0200 +++ new/yast2-registration-3.1.84/test/addon_spec.rb 2014-07-04 10:52:42.000000000 +0200 @@ -196,7 +196,37 @@ it "returns true when the addon availability is not set" do expect(addon.selectable?).to be_true end + end + + describe "#updates_addon?" do + it "returns true if the old addon has the same name" do + product = addon_generator("zypper_name" => "sle-sdk") + + new_addon = Registration::Addon.new(product) + old_addon = { "name" => "sle-sdk", "version" => "12", "arch" => "x86_64" } + + expect(new_addon.updates_addon?(old_addon)).to be_true + end + + it "returns true if the old addon is a predecessor" do + # "sle-haegeo" (SLE11-SP2) has been renamed to "sle-ha-geo" (SLE12) + product = addon_generator("zypper_name" => "sle-ha-geo", + "former_identifier" => "sle-haegeo") + new_addon = Registration::Addon.new(product) + old_addon = { "name" => "sle-haegeo", "version" => "12", "arch" => "x86_64" } + + expect(new_addon.updates_addon?(old_addon)).to be_true + end + + it "returns false if the old addon is different" do + product = addon_generator("zypper_name" => "sle-sdk") + + new_addon = Registration::Addon.new(product) + old_addon = { "name" => "sle-hae", "version" => "12", "arch" => "x86_64" } + + expect(new_addon.updates_addon?(old_addon)).to be_false + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-registration-3.1.83/test/factories.rb new/yast2-registration-3.1.84/test/factories.rb --- old/yast2-registration-3.1.83/test/factories.rb 2014-07-03 15:35:36.000000000 +0200 +++ new/yast2-registration-3.1.84/test/factories.rb 2014-07-04 10:52:42.000000000 +0200 @@ -14,6 +14,7 @@ params['free'] = attrs.fetch('free', true) params['eula_url'] = attrs['eula_url'] params["extensions"] = attrs['extensions'] || [] + params["former_identifier"] = attrs["former_identifier"] params end continue with "q"... Checked in at Fri Jul 4 15:56:11 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