[yast-commit] r62727 - /branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp
Author: jsrain Date: Wed Nov 3 10:57:37 2010 New Revision: 62727 URL: http://svn.opensuse.org/viewcvs/yast?rev=62727&view=rev Log: enable Abort button when selecting system to upgrade (bnc#645429) Modified: branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp?rev=62727&r1=62726&r2=62727&view=diff ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/include/rootpart.ycp Wed Nov 3 10:57:37 2010 @@ -20,6 +20,7 @@ import "Report"; import "Update"; import "Installation"; +import "Mode"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -222,6 +223,8 @@ if (flavor == `update_dialog) { Wizard::SetContents (title, contents, help_text, true, true); + if (Mode::autoupgrade()) + Wizard::EnableAbortButton(); } else if (flavor == `update_dialog_proposal) { @@ -285,6 +288,8 @@ else ret = UI::UserInput (); + if (ret == `cancel) + ret = `abort; if (ret == `abort && Popup::ConfirmAbort (`painless)) break; @@ -371,6 +376,8 @@ if (flavor != `update_dialog) UI::CloseDialog (); + else if (Mode::autoupgrade()) + Wizard::DisableAbortButton(); // New partition has been mounted if (flavor == `update_dialog && ret == `next) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsrain@svn2.opensuse.org