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# 890364 : "Bootloader installation fails on lvm with gpt" (NEEDINFO/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-08-05 13:33:03.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-08-06 11:19:55.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 6 08:59:52 UTC 2014 - jreidinger@suse.com + +- ignore unknown priority device to avoid problems in corner case + scenarios (bnc#890364) +- 3.1.82 + +------------------------------------------------------------------- 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:42292 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-bootloader-3.1.81.tar.bz2 New: ---- yast2-bootloader-3.1.82.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.xB6cqh/_old 2014-08-06 16:41:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xB6cqh/_new 2014-08-06 16:41:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.81 +Version: 3.1.82 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.81.tar.bz2 -> yast2-bootloader-3.1.82.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.81/package/yast2-bootloader.changes new/yast2-bootloader-3.1.82/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.81/package/yast2-bootloader.changes 2014-08-05 11:54:40.000000000 +0200 +++ new/yast2-bootloader-3.1.82/package/yast2-bootloader.changes 2014-08-06 11:14:43.000000000 +0200 @@ -1,9 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 6 08:59:52 UTC 2014 - jreidinger@suse.com + +- ignore unknown priority device to avoid problems in corner case + scenarios (bnc#890364) +- 3.1.82 + +------------------------------------------------------------------- Tue Aug 5 09:17:20 UTC 2014 - jreidinger@suse.com - fix assigning priority disks to device map for md raid - (bnc#890246) -- fix choosing priority device causing bootloader crash + (bnc#890246) +- fix choosing priority device causing bootloader crash (bnc#890204) - 3.1.81 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.81/package/yast2-bootloader.spec new/yast2-bootloader-3.1.82/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.81/package/yast2-bootloader.spec 2014-08-05 11:54:40.000000000 +0200 +++ new/yast2-bootloader-3.1.82/package/yast2-bootloader.spec 2014-08-06 11:14:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.81 +Version: 3.1.82 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.81/src/modules/BootStorage.rb new/yast2-bootloader-3.1.82/src/modules/BootStorage.rb --- old/yast2-bootloader-3.1.81/src/modules/BootStorage.rb 2014-08-05 11:54:41.000000000 +0200 +++ new/yast2-bootloader-3.1.82/src/modules/BootStorage.rb 2014-08-06 11:14:44.000000000 +0200 @@ -802,13 +802,20 @@ device_mapping = device_mapping.dup first_available_id = 0 keys = device_mapping.keys + # sort keys by its order in device mapping + keys.sort_by! {|k| device_mapping[k][/\d+$/] } if priority_device - first_available_id = 1 - old_first_device = device_mapping.key("hd0") - old_device_id = device_mapping[priority_device] - device_mapping[old_first_device] = old_device_id - device_mapping[priority_device] = "hd0" + # change order of priority device if it is already in device map, otherwise ignore them + if device_mapping[priority_device] + first_available_id = 1 + old_first_device = device_mapping.key("hd0") + old_device_id = device_mapping[priority_device] + device_mapping[old_first_device] = old_device_id + device_mapping[priority_device] = "hd0" + else + log.warn("Unknown priority device '#{priority_device}'. Skipping") + end end # put bad_devices at bottom diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.81/test/boot_storage_test.rb new/yast2-bootloader-3.1.82/test/boot_storage_test.rb --- old/yast2-bootloader-3.1.81/test/boot_storage_test.rb 2014-08-05 11:54:41.000000000 +0200 +++ new/yast2-bootloader-3.1.82/test/boot_storage_test.rb 2014-08-06 11:14:44.000000000 +0200 @@ -58,6 +58,17 @@ ).to eq(result) end + it "ignores priority device which is not in device map already" do + device_map = { "/dev/sda" => "hd1", "/dev/sdb" => "hd0" } + result = { "/dev/sda" => "hd1", "/dev/sdb" => "hd0" } + expect( + Yast::BootStorage.changeOrderInDeviceMapping( + device_map, + priority_device: "/dev/system" + ) + ).to eq(result) + end + it "place bad devices at the end of list" do device_map = { "/dev/sda" => "hd0", "/dev/sdb" => "hd1" } result = { "/dev/sda" => "hd1", "/dev/sdb" => "hd0" } continue with "q"... Checked in at Wed Aug 6 16:41:39 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