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# 889770 : "Saving bootloader configuration: undefined method '[]' for nil:NilClass" (RESOLVED/FIXED) ## BNC# 885867 : "'Up' button doesn't work on Disk Order Settings of yast bootloader" (ASSIGNED/) ## BNC# 879686 : "during upgrade, installer doesn't enable grub2-branding-SLE" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes 2014-07-31 10:03:54.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes 2014-08-01 09:53:27.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Aug 1 07:37:50 UTC 2014 - jsrain@suse.cz + +- fixed bootloader installation (bnc#889770) +- 3.1.80 + +------------------------------------------------------------------- +Thu Jul 31 14:01:43 UTC 2014 - jreidinger@suse.com + +- Disk order dialog: + - fix non-working up button (bnc#885867) + - fix enabling/disabling up/down buttons in various situations + - when adding new device set focus to input field to better UX +- 3.1.79 + +------------------------------------------------------------------- +Thu Jul 31 12:40:37 UTC 2014 - jreidinger@suse.com + +- reinit branding in upgrade of SLE-12 as it is overwritten + (bnc#879686) +- 3.1.78 + +------------------------------------------------------------------- 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:42104 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-bootloader-3.1.77.tar.bz2 New: ---- yast2-bootloader-3.1.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.iPS1AP/_old 2014-08-01 10:20:26.000000000 +0200 +++ /var/tmp/diff_new_pack.iPS1AP/_new 2014-08-01 10:20:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-bootloader # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,70 +17,54 @@ Name: yast2-bootloader -Version: 3.1.77 +Version: 3.1.80 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -BuildRequires: rubygem-rspec -BuildRequires: update-desktop-files -BuildRequires: yast2 >= 3.1.0 +Group: System/YaST +License: GPL-2.0+ BuildRequires: yast2-devtools >= 3.1.10 +BuildRequires: yast2 >= 3.1.0 +BuildRequires: update-desktop-files +BuildRequires: rubygem-rspec PreReq: /bin/sed %fillup_prereq # Installation::*version variables # Wizard::SetDialogTitleAndIcon -Requires: parted -Requires: perl-Bootloader-YAML -Requires: perl-Compress-Zlib Requires: yast2 >= 3.1.0 -Requires: yast2-core >= 2.18.7 Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 -Requires: yast2-storage >= 2.18.18 +Requires: perl-Bootloader-YAML +Requires: yast2-core >= 2.18.7 +Requires: yast2-storage >= 2.18.18 parted perl-Compress-Zlib %ifarch %ix86 x86_64 Requires: syslinux %endif -Provides: yast2-config-bootloader -Provides: yast2-config-lilo -Obsoletes: yast2-config-bootloader -Obsoletes: yast2-config-lilo -Provides: yast2-agent-liloconf -Provides: yast2-agent-prom -Obsoletes: yast2-agent-liloconf -Obsoletes: yast2-agent-prom -Provides: yast2-trans-boot -Provides: yast2-trans-inst-bootloader -Provides: yast2-trans-lilo -Obsoletes: yast2-trans-boot -Obsoletes: yast2-trans-inst-bootloader -Obsoletes: yast2-trans-lilo -Provides: y2c_boot -Provides: y2t_boot -Obsoletes: y2c_boot -Obsoletes: y2t_boot -Provides: y2t_inst-bootloader -Provides: yast2-agent-liloconf-devel -Provides: yast2-agent-prom-devel -Obsoletes: y2t_inst-bootloader -Obsoletes: yast2-agent-liloconf-devel -Obsoletes: yast2-agent-prom-devel +Provides: yast2-config-lilo yast2-config-bootloader +Obsoletes: yast2-config-lilo yast2-config-bootloader +Provides: yast2-agent-liloconf yast2-agent-prom +Obsoletes: yast2-agent-liloconf yast2-agent-prom +Provides: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot +Obsoletes: yast2-trans-inst-bootloader yast2-trans-lilo yast2-trans-boot +Provides: y2c_boot y2t_boot +Obsoletes: y2c_boot y2t_boot +Provides: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel +Obsoletes: y2t_inst-bootloader yast2-agent-liloconf-devel yast2-agent-prom-devel Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Bootloader Configuration -License: GPL-2.0+ -Group: System/YaST %description This package contains the YaST2 component for bootloader configuration. %package devel-doc Requires: yast2-bootloader = %version -Summary: YaST2 - Bootloader Configuration - Development Documentation Group: System/YaST +Summary: YaST2 - Bootloader Configuration - Development Documentation %description devel-doc This package contains development documentation for using the API @@ -98,6 +82,7 @@ %install %yast_install + %post %{fillup_only -n bootloader} @@ -135,4 +120,3 @@ %files devel-doc %doc %{yast_docdir}/autodocs -%changelog ++++++ yast2-bootloader-3.1.77.tar.bz2 -> yast2-bootloader-3.1.80.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.77/package/yast2-bootloader.changes new/yast2-bootloader-3.1.80/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.77/package/yast2-bootloader.changes 2014-07-31 09:23:42.000000000 +0200 +++ new/yast2-bootloader-3.1.80/package/yast2-bootloader.changes 2014-08-01 09:49:46.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Fri Aug 1 07:37:50 UTC 2014 - jsrain@suse.cz + +- fixed bootloader installation (bnc#889770) +- 3.1.80 + +------------------------------------------------------------------- +Thu Jul 31 14:01:43 UTC 2014 - jreidinger@suse.com + +- Disk order dialog: + - fix non-working up button (bnc#885867) + - fix enabling/disabling up/down buttons in various situations + - when adding new device set focus to input field to better UX +- 3.1.79 + +------------------------------------------------------------------- +Thu Jul 31 12:40:37 UTC 2014 - jreidinger@suse.com + +- reinit branding in upgrade of SLE-12 as it is overwritten + (bnc#879686) +- 3.1.78 + +------------------------------------------------------------------- Thu Jul 31 06:48:59 UTC 2014 - jreidinger@suse.com - fix crash in bootloader caused by wrong device in device map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.77/package/yast2-bootloader.spec new/yast2-bootloader-3.1.80/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.77/package/yast2-bootloader.spec 2014-07-31 09:23:42.000000000 +0200 +++ new/yast2-bootloader-3.1.80/package/yast2-bootloader.spec 2014-08-01 09:49:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.77 +Version: 3.1.80 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.77/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.80/src/clients/bootloader_finish.rb --- old/yast2-bootloader-3.1.77/src/clients/bootloader_finish.rb 2014-07-31 09:23:42.000000000 +0200 +++ new/yast2-bootloader-3.1.80/src/clients/bootloader_finish.rb 2014-08-01 09:49:46.000000000 +0200 @@ -214,6 +214,18 @@ @ret = nil end + # FIXME workaround grub2 in upgrade need manual rerun of branding + # package. see bnc#879686 + if Mode.update && Bootloader.getLoaderType =~ /grub2/ + prefix = Installation.destdir + branding_activator = Dir["#{prefix}/usr/share/grub2/themes/*/activate-theme"].first + if branding_activator + branding_activator = branding_activator[prefix.size..-1] + res = SCR.Execute(path(".target.bash_output"), branding_activator) + Builtins.y2milestone("Reactivate branding with #{branding_activator} and result #{res}") + end + end + Builtins.y2debug("ret=%1", @ret) Builtins.y2milestone("bootloader_finish finished") deep_copy(@ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.77/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.80/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.77/src/include/bootloader/grub/options.rb 2014-07-31 09:23:42.000000000 +0200 +++ new/yast2-bootloader-3.1.80/src/include/bootloader/grub/options.rb 2014-08-01 09:49:46.000000000 +0200 @@ -464,70 +464,60 @@ VSpacing(1) ) UI.OpenDialog(popup) - pushed = Convert.to_symbol(UI.UserInput) - new_dev = Convert.to_string(UI.QueryWidget(Id(:devname), :Value)) + UI.SetFocus(:devname) + pushed = UI.UserInput + new_dev = UI.QueryWidget(Id(:devname), :Value) UI.CloseDialog - ret = "" - ret = new_dev if pushed == :ok - ret + + pushed == :ok ? new_dev : "" end def HandleDiskOrder(widget, event) - event = deep_copy(event) - action = Ops.get(event, "ID") + action = event["ID"] changed = false - disksOrder = Convert.convert( - UI.QueryWidget(Id(:disks), :Items), - :from => "any", - :to => "list <term>" - ) - current = Convert.to_string(UI.QueryWidget(Id(:disks), :CurrentItem)) + disksOrder = UI.QueryWidget(Id(:disks), :Items) + current = UI.QueryWidget(Id(:disks), :CurrentItem) pos = 0 - while Ops.less_than(pos, Builtins.size(disksOrder)) && - GetItemID(Ops.get(disksOrder, pos) { term(:Item, Id("")) }) != current - pos = Ops.add(pos, 1) + while pos < disksOrder.size && + GetItemID(disksOrder[pos] || term(:Item, Id(""))) != current + pos += 1 end + Builtins.y2debug("Calling handle disk order with action #{action} and selected on pos #{pos}") - #disabling & enabling up/down - UI.ChangeWidget( - Id(:up), - :Enabled, - Ops.greater_than(pos, 0) && - Ops.less_than(pos, Builtins.size(disksOrder)) - ) - UI.ChangeWidget( - Id(:down), - :Enabled, - Ops.less_than(pos, Ops.subtract(Builtins.size(disksOrder), 1)) - ) - if action == :up + case action + when :up changed = true - disksOrder = Builtins::List.swap(disksOrder, pos, Ops.subtract(pos, 1)) - elsif action == :down + # swap elements + disksOrder.insert(pos - 1, disksOrder.delete_at(pos)) + pos -= 1 + when :down changed = true - disksOrder = Builtins::List.swap(disksOrder, pos, Ops.add(pos, 1)) - elsif action == :delete + # swap elements + disksOrder.insert(pos + 1, disksOrder.delete_at(pos)) + pos += 1 + when :delete changed = true disksOrder = Builtins.remove(disksOrder, pos) + pos = pos > 0 ? pos -1 : 0 UI.ChangeWidget( Id(:disks), :CurrentItem, - Ops.greater_than(pos, 0) ? - GetItemID(Ops.get(disksOrder, Ops.subtract(pos, 1)) do - term(:Item, Id("")) - end) : - GetItemID(Ops.get(disksOrder, 0) { term(:Item, Id("")) }) + GetItemID(disksOrder[pos] || term(:Item, Id(""))) ) - elsif action == :add + when :add new_dev = NewDevicePopup() if new_dev != "" changed = true - disksOrder = Builtins.add(disksOrder, Item(Id(new_dev), new_dev)) + disksOrder << Item(Id(new_dev), new_dev) end end + #disabling & enabling up/down, do it after change + UI.ChangeWidget(Id(:up), :Enabled, pos > 0 && pos < disksOrder.size) + UI.ChangeWidget(Id(:down), :Enabled, pos < disksOrder.size - 1) + UI.ChangeWidget(Id(:disks), :Items, disksOrder) if changed nil @@ -550,7 +540,7 @@ HSpacing(2), VBox( VSpacing(1), - SelectionBox(Id(:disks), Opt(:notify, :immediate), _("D&isks"), []), + SelectionBox(Id(:disks), Opt(:notify), _("D&isks"), []), HBox( HStretch(), PushButton(Id(:add), Opt(:key_F3), Label.AddButton), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.77/src/include/bootloader/grub2/misc.rb new/yast2-bootloader-3.1.80/src/include/bootloader/grub2/misc.rb --- old/yast2-bootloader-3.1.77/src/include/bootloader/grub2/misc.rb 2014-07-31 09:23:42.000000000 +0200 +++ new/yast2-bootloader-3.1.80/src/include/bootloader/grub2/misc.rb 2014-08-01 09:49:46.000000000 +0200 @@ -440,7 +440,7 @@ mbr_dev = Ops.get_string(m_activate, "mbr", "") raise "INTERNAL ERROR: Data for partition to activate is invalid." if num == 0 || mbr_dev.empty? - gpt_disk = Storage.GetTargetMap[BootCommon.mbrDisk]["label"] == "gpt" + gpt_disk = Storage.GetDisk(Storage.GetTargetMap, BootCommon.mbrDisk)["label"] == "gpt" # if primary partition on old DOS MBR table, GPT do not have such limit if !(Arch.ppc && gpt_disk) && (gpt_disk || num <= 4) continue with "q"... Checked in at Fri Aug 1 10:21:02 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