Author: lslezak Date: Mon Oct 18 17:11:25 2010 New Revision: 62648 URL: http://svn.opensuse.org/viewcvs/yast?rev=62648&view=rev Log: - don't display extra error popup when a download fails, the error is reported later via MediaChange callback anyway (bnc#625987) - 2.20.1 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=62648&r1=62647&r2=62648&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Oct 18 17:11:25 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/PackageCallbacks.ycp?rev=62648&r1=62647&r2=62648&view=diff ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Mon Oct 18 17:11:25 2010 @@ -2074,10 +2074,14 @@ return true; } - + // just log the status, errors are handled in MediaChange callback global void DoneDownload (integer error_value, string error_text) { - if (error_value != 0) + if (error_value == 0) + { + y2milestone("Download finished"); + } + else { if (autorefreshing && autorefreshing_aborted) { @@ -2085,17 +2089,7 @@ } else { - if (Mode::commandline()) { - //error message, %1 is the cause for the error - CommandLine::Print(sformat (_("Download failed: - %1"), error_text)); - } - else - { - // error message, %1 is the cause for the error - Popup::Error (sformat (_("Download failed: - %1"), error_text)); - } + y2warning("Download failed: error %1: %2", error_value, error_text); } } } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=62648&r1=62647&r2=62648&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Oct 18 17:11:25 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 18 15:04:37 UTC 2010 - lslezak@suse.cz + +- don't display extra error popup when a download fails, the error + is reported later via MediaChange callback anyway (bnc#625987) +- 2.20.1 + +------------------------------------------------------------------- Wed Oct 13 10:07:55 CEST 2010 - jsuchome@suse.cz - open LongError popup instead of Error if the message is too long -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org