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-bootloader -> sle12 ## BNC# 874646 : "Empty bootloader proposal during upgrade" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-04-22 12:34:58.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-04-30 13:18:36.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 19:47:03 UTC 2014 - jreidinger@suse.com + +- fix reading of previous bootloader (bnc#874646) +- 3.1.30 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-bootloader - yast2-kdump - yast2-product-creator - yast2-reipl - yast2-schema - yast2-vm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-bootloader (Old) and /mounts/work_src_done/SLE12/yast2-bootloader (BS:build ID:37198 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-bootloader-3.1.29.tar.bz2 New: ---- yast2-bootloader-3.1.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.BW0qtB/_old 2014-04-30 15:07:40.000000000 +0200 +++ /var/tmp/diff_new_pack.BW0qtB/_new 2014-04-30 15:07:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.29 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.29.tar.bz2 -> yast2-bootloader-3.1.30.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/package/yast2-bootloader.changes new/yast2-bootloader-3.1.30/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.29/package/yast2-bootloader.changes 2014-04-22 11:18:35.000000000 +0200 +++ new/yast2-bootloader-3.1.30/package/yast2-bootloader.changes 2014-04-30 13:16:09.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 29 19:47:03 UTC 2014 - jreidinger@suse.com + +- fix reading of previous bootloader (bnc#874646) +- 3.1.30 + +------------------------------------------------------------------- Tue Apr 22 08:44:57 UTC 2014 - jreidinger@suse.com - Use correct check for partition setup for grub2 on s390 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/package/yast2-bootloader.spec new/yast2-bootloader-3.1.30/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.29/package/yast2-bootloader.spec 2014-04-22 11:18:35.000000000 +0200 +++ new/yast2-bootloader-3.1.30/package/yast2-bootloader.spec 2014-04-30 13:16:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.29 +Version: 3.1.30 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb new/yast2-bootloader-3.1.30/src/clients/bootloader_proposal.rb --- old/yast2-bootloader-3.1.29/src/clients/bootloader_proposal.rb 2014-04-22 11:18:35.000000000 +0200 +++ new/yast2-bootloader-3.1.30/src/clients/bootloader_proposal.rb 2014-04-30 13:16:09.000000000 +0200 @@ -19,6 +19,7 @@ Yast.import "BootCommon" Yast.import "Bootloader" Yast.import "GfxMenu" + Yast.import "Installation" Yast.import "Storage" Yast.import "Mode" Yast.import "BootSupportCheck" @@ -54,7 +55,7 @@ end if Mode.update - if ["grub2", "grub2-efi"].include? Bootloader.getLoaderType + if ["grub2", "grub2-efi"].include? old_bootloader Builtins.y2milestone "update of grub2, do not repropose" Bootloader.blRead(true, true) else @@ -231,7 +232,25 @@ deep_copy(@ret) end - end + + private + BOOT_SYSCONFIG_PATH = "/etc/sysconfig/bootloader" + # read bootloader from /mnt as SCR is not yet switched in proposal + # phase of update (bnc#874646) + def old_bootloader + target_boot_sysconfig_path = ::File.join(Installation.destdir, BOOT_SYSCONFIG_PATH) + return nil unless ::File.exists? target_boot_sysconfig_path + + boot_sysconfig = ::File.read target_boot_sysconfig_path + old_bootloader = boot_sysconfig.lines.grep /^\s*LOADER_TYPE/ + Builtins.y2milestone "bootloader entry #{old_bootloader.inspect}" + retur nil if old_bootloader.empty? + + # get value from entry + old_bootloader.last.sub(/^.*=\s*(\S*).*/,"\\1").delete('"') + end + + end unless defined? Yast::BootloaderProposalClient end Yast::BootloaderProposalClient.new.main continue with "q"... Checked in at Wed Apr 30 15:07:50 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