Author: lslezak Date: Fri Nov 5 14:00:44 2010 New Revision: 62754 URL: http://svn.opensuse.org/viewcvs/yast?rev=62754&view=rev Log: - PackageCallbacks: removed the retry/abort/skip dialog from DoneProvide callback - the user is asked via MediaChange callback, don't ask twice when aborting. - 2.20.3 Modified: trunk/yast2/VERSION trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=62754&r1=62753&r2=62754&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Nov 5 14:00:44 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacks.ycp?rev=62754&r1=62753&r2=62754&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Fri Nov 5 14:00:44 2010 @@ -318,141 +318,9 @@ CommandLine::PrintVerboseNoCR(clear_string); } - if (provide_aborted) - { - provide_aborted = false; - return "C"; - } - if (error != 0) { - // this is for error code 1 ("NOT_FOUND"), %1 is name of a package - string message = sformat (_("Package %1 was not found on the medium."), name); - - // "IO" - if (error == 2) - { - // error message, %1 is a package name - message = sformat(_("Package %1 could not be downloaded (input/output error)."), name); - } - // "INVALID" - else if (error == 3) - { - // error message, %1 is a package name - message = sformat(_("Package %1 is broken, integrity check has failed."), name); - } - - - if (Mode::commandline()) { - CommandLine::Print(message); - - // ask user in the interactive mode - if (CommandLine::Interactive()) - { - CommandLine::Print(""); - - // command line mode - ask user whether installation of the failed package should be retried - CommandLine::Print(_("Retry installation of the package?")); - - if (CommandLine::YesNo()) - { - // return Retry - return "R"; - } - - // command line mode - ask user whether the installation should be aborted - CommandLine::Print(_("Abort the installation?")); - if (CommandLine::YesNo()) - { - // return Abort - return "C"; - } - - // otherwise return Ignore (default) - return "I"; - } - - return "I"; - } - - term button_box = `ButtonBox ( - `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), - `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), - `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) - ); - - if ( showLongInfo ) - { - UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) ); - UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) ); - } - else - { - UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, vsize_no_details, false) ); - UI::ReplaceWidget(`id(`info), `Empty() ); - } - - any r = nil; - - repeat - { - r = UI::UserInput(); - if ( r == `show ) - { - showLongInfo = ShowLogInfo (message, button_box); - if (showLongInfo) - { - string error_symbol = "ERROR"; - - if (error == 1) - { - error_symbol = "NOT_FOUND"; - } - else if (error == 2) - { - error_symbol = "IO"; - } - else if (error == 3) - { - error_symbol = "INVALID"; - } - - UI::ReplaceWidget(`id(`info), - `RichText (`opt(`plainText), - // error message, %1 is code of the error, - // detail string is appended to the end - sformat (_("Error: %1:"), error_symbol) + reason) ); - } - else - { - UI::ReplaceWidget(`id(`info), `Empty() ); - } - } - } until (r == `abort || r == `retry || r == `ignore); - - y2milestone ("DoneProvide %1", r); - - UI::CloseDialog(); - - if (r == `abort) - return "C"; - if (r == `retry) - return "R"; - if (r == `ignore) - { - // don't show the warning when a refresh fails - if (!autorefreshing) - { - // TODO: add "Don't show again" checkbox - // a warning popup displayed after pressing [Ignore] after a download error - Popup::Warning(_("Ignoring a download failure may result in a broken system. -The system should be later verified by running the Software Management module.")); - } - - return "I"; - } - - y2error("Unknown user input: %1", r); + return "C"; } return "I"; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=62754&r1=62753&r2=62754&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Nov 5 14:00:44 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Nov 5 12:40:03 UTC 2010 - lslezak@suse.cz + +- PackageCallbacks: removed the retry/abort/skip dialog from + DoneProvide callback - the user is asked via MediaChange + callback, don't ask twice when aborting. +- 2.20.3 + +------------------------------------------------------------------- Tue Nov 2 15:09:00 UTC 2010 - lslezak@suse.cz - updated to match the changed StartPackage callback signature -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org