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-installation -> sle12 ## BNC# 886662 : ""Abort" button aborts the installation without confirmation" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-07-04 15:55:18.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-07-15 17:44:03.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 15 15:44:41 CEST 2014 - locilka@suse.com + +- Asking user for confirmation while aborting the installation in + disk activation dialog (bnc#886662) +- 3.1.100 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 19 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:41195 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.99.tar.bz2 New: ---- yast2-installation-3.1.100.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.ZQHiHU/_old 2014-07-16 15:36:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ZQHiHU/_new 2014-07-16 15:36:27.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.99 +Version: 3.1.100 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.99.tar.bz2 -> yast2-installation-3.1.100.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.99/package/yast2-installation.changes new/yast2-installation-3.1.100/package/yast2-installation.changes --- old/yast2-installation-3.1.99/package/yast2-installation.changes 2014-07-04 11:05:36.000000000 +0200 +++ new/yast2-installation-3.1.100/package/yast2-installation.changes 2014-07-15 17:40:44.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 15 15:44:41 CEST 2014 - locilka@suse.com + +- Asking user for confirmation while aborting the installation in + disk activation dialog (bnc#886662) +- 3.1.100 + +------------------------------------------------------------------- Fri Jul 4 08:48:03 UTC 2014 - jreidinger@suse.com - Copy multipath blacklist to target system (bnc#885628) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.99/package/yast2-installation.spec new/yast2-installation-3.1.100/package/yast2-installation.spec --- old/yast2-installation-3.1.99/package/yast2-installation.spec 2014-07-04 11:05:36.000000000 +0200 +++ new/yast2-installation-3.1.100/package/yast2-installation.spec 2014-07-15 17:40:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.99 +Version: 3.1.100 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.99/src/clients/inst_disks_activate.rb new/yast2-installation-3.1.100/src/clients/inst_disks_activate.rb --- old/yast2-installation-3.1.99/src/clients/inst_disks_activate.rb 2014-07-04 11:05:36.000000000 +0200 +++ new/yast2-installation-3.1.100/src/clients/inst_disks_activate.rb 2014-07-15 17:40:44.000000000 +0200 @@ -101,7 +101,6 @@ missing_part end - @contents = HBox( HWeight(999, HStretch()), VBox( @@ -116,20 +115,12 @@ HWeight(999, HStretch()) ) - Wizard.SetContents( - @caption, - @contents, - @help, - GetInstArgs.enable_back, - GetInstArgs.enable_next - ) - Wizard.SetTitleIcon("disk") - Wizard.SetFocusToNextButton - - @ret = nil @disks_changed = false - while @ret == nil + + while @ret.nil? + show_base_dialog @ret = UI.UserInput + case @ret when :dasd WFM.call("inst_dasd") @@ -146,21 +137,14 @@ when :network WFM.call("inst_lan", [@argmap.merge({"skip_detection" => true})]) @ret = :redraw + when :abort + @ret = nil if Popup.ConfirmAbort(:painless) end + if @ret == :redraw @disks_changed = true - Wizard.SetContents( - @caption, - @contents, - @help, - GetInstArgs.enable_back, - GetInstArgs.enable_next - ) - Wizard.SetTitleIcon("disk") - Wizard.SetFocusToNextButton @ret = nil end - RestoreButtons(GetInstArgs.enable_back, GetInstArgs.enable_next) end if @have_dasd && @ret == :next @@ -185,6 +169,20 @@ private + def show_base_dialog + Wizard.SetContents( + @caption, + @contents, + @help, + GetInstArgs.enable_back, + GetInstArgs.enable_next + ) + + Wizard.SetTitleIcon("disk") + RestoreButtons(GetInstArgs.enable_back, GetInstArgs.enable_next) + Wizard.SetFocusToNextButton + end + def button(id, title) HWeight( 1, @@ -204,16 +202,9 @@ Wizard.RestoreAbortButton Wizard.RestoreNextButton Wizard.RestoreBackButton - if enable_back - Wizard.EnableBackButton - else - Wizard.DisableBackButton - end - if enable_next - Wizard.EnableNextButton - else - Wizard.DisableNextButton - end + + enable_back ? Wizard.EnableBackButton : Wizard.DisableBackButton + enable_next ? Wizard.EnableNextButton : Wizard.DisableNextButton end end end continue with "q"... Checked in at Wed Jul 16 15:36:41 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