Script 'mail_helper' called by bg Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: bg. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-update -> sle12 ## BNC# 881320 : "SLE12 SCC service repositories are ignored at upgrade from SLE11" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-update/yast2-update.changes 2014-05-23 16:15:02.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-update/yast2-update.changes 2014-06-06 16:23:41.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 6 13:35:01 UTC 2014 - lslezak@suse.cz + +- override the target distribution from the system, use the target + distribution from the base product so the service repositories + are compatible with the upgraded (future) product (bnc#881320) +- 3.1.10 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-product-creator - yast2-schema - yast2-update ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-update (Old) and /mounts/work_src_done/SLE12/yast2-update (BS:build ID:39109 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-update", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-update-3.1.9.tar.bz2 New: ---- yast2-update-3.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.BAYw4b/_old 2014-06-10 10:05:48.000000000 +0200 +++ /var/tmp/diff_new_pack.BAYw4b/_new 2014-06-10 10:05:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,9 @@ # Packages.default_patterns Requires: yast2-packager >= 3.1.10 +# Pkg.TargetInitializeOptions() +Requires: yast2-pkg-bindings >= 3.1.14 + # moved into yast2-update from yast2-installation # to remove dependency on yast2-storage Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp ++++++ yast2-update-3.1.9.tar.bz2 -> yast2-update-3.1.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.9/package/yast2-update.changes new/yast2-update-3.1.10/package/yast2-update.changes --- old/yast2-update-3.1.9/package/yast2-update.changes 2014-05-23 10:25:17.000000000 +0200 +++ new/yast2-update-3.1.10/package/yast2-update.changes 2014-06-06 16:21:24.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jun 6 13:35:01 UTC 2014 - lslezak@suse.cz + +- override the target distribution from the system, use the target + distribution from the base product so the service repositories + are compatible with the upgraded (future) product (bnc#881320) +- 3.1.10 + +------------------------------------------------------------------- Thu May 22 07:40:27 UTC 2014 - jsrain@suse.cz - allow to specify target for AutoYaST upgrade via boot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.9/package/yast2-update.spec new/yast2-update-3.1.10/package/yast2-update.spec --- old/yast2-update-3.1.9/package/yast2-update.spec 2014-05-23 10:25:17.000000000 +0200 +++ new/yast2-update-3.1.10/package/yast2-update.spec 2014-06-06 16:21:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.9 +Version: 3.1.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +49,9 @@ # Packages.default_patterns Requires: yast2-packager >= 3.1.10 +# Pkg.TargetInitializeOptions() +Requires: yast2-pkg-bindings >= 3.1.14 + # moved into yast2-update from yast2-installation # to remove dependency on yast2-storage Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.9/src/include/update/rootpart.rb new/yast2-update-3.1.10/src/include/update/rootpart.rb --- old/yast2-update-3.1.9/src/include/update/rootpart.rb 2014-05-23 10:25:17.000000000 +0200 +++ new/yast2-update-3.1.10/src/include/update/rootpart.rb 2014-06-06 16:21:24.000000000 +0200 @@ -45,6 +45,7 @@ Yast.import "Installation" Yast.import "FileSystems" Yast.import "Mode" + Yast.import "Product" end # Returns boolean whether partition can be @@ -418,8 +419,12 @@ # New partition has been mounted if flavor == :update_dialog && ret == :next - # Target load failed, #466803 - if Pkg.TargetInitialize(Installation.destdir) != true + # override the current target distribution at the system and use + # the target distribution from the base product to make the new service + # repositories compatible with the base product at upgrade (bnc#881320) + if Pkg.TargetInitializeOptions(Installation.destdir, + "target_distro" => target_distribution) != true + # Target load failed, #466803 Builtins.y2error("Pkg::TargetInitialize failed") if Popup.AnyQuestion( Label.ErrorMsg, @@ -470,5 +475,17 @@ Convert.to_symbol(ret) end + + def target_distribution + base_products = Product.FindBaseProducts + + # empty target distribution disables service compatibility check in case + # the base product cannot be found + target_distro = base_products ? base_products.first["register_target"] : "" + log.info "Base product target distribution: #{target_distro}" + + target_distro + end + end end continue with "q"... Checked in at Tue Jun 10 10:06:07 CEST 2014 by bg Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org