Author: jsuchome Date: Wed Oct 10 14:51:46 2007 New Revision: 41328 URL: http://svn.opensuse.org/viewcvs/yast?rev=41328&view=rev Log: - do not log progress on DoneDownload callback (#331271) - 2.16.0 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=41328&r1=41327&r2=41328&view=diff ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Oct 10 14:51:46 2007 @@ -1 +1 @@ -2.15.23 +2.16.0 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-online-update.changes?rev=41328&r1=41327&r2=41328&view=diff ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Oct 10 14:51:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 10 14:37:12 CEST 2007 - jsuchome@suse.cz + +- do not log progress on DoneDownload callback (#331271) +- 2.16.0 + +------------------------------------------------------------------- Wed Sep 19 09:16:05 CEST 2007 - jsuchome@suse.cz - removed popup used for debugging (#326247) Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCallbacks.ycp?rev=41328&r1=41327&r2=41328&view=diff ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Wed Oct 10 14:51:46 2007 @@ -206,7 +206,7 @@ string ret = PackageCallbacks::DoneProvide (error, reason, name); if (ret == "I") { - if (last_callback == "StartProvide") + if (last_callback != "FinishPatchDeltaProvide") FinishLine (false); total_progress = total_progress + 1; if ( UI::WidgetExists( `id( `you_total_progress ) ) ) { @@ -218,9 +218,13 @@ } global void DoneDownload (integer error_value, string error_text) { - PackageCallbacks::DoneDownload (error_value, error_text); if (last_callback != "FinishPatchDeltaProvide") + y2debug ("DoneDownload %1, %2", error_value, error_text); + PackageCallbacks::DoneDownload (error_value, error_text); + /* + if (last_callback != "FinishPatchDeltaProvide") FinishLine (false); last_callback = "DoneDownload"; + */ } /** @@ -231,7 +235,7 @@ // progress log item (%1 is name of delta RPM if (last_callback == "StartProvide" || last_callback == "StartDownload") ProgressLog ("\n" + indent); - ProgressLog (sformat(_("Downloading delta RPM %1"), name)); + ProgressLog (sformat(_("Downloading delta RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -273,7 +277,7 @@ */ global void StartDeltaApply (string name) { // progress log item (%1 is name of delta RPM) - ProgressLog (indent + sformat(_("Applying delta RPM: %1"), name)); + ProgressLog (indent + sformat(_("Applying delta RPM: %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -318,7 +322,7 @@ // progress log item (%1 is name of delta RPM) if (last_callback == "StartProvide") ProgressLog ("\n" + indent); - ProgressLog (sformat(_("Downloading patch RPM %1"), name)); + ProgressLog (sformat(_("Downloading patch RPM %1 "), name)); if (UI::WidgetExists (`id (`you_patch_progress))) { UI::ChangeWidget (`id (`you_patch_progress), `Label, @@ -357,7 +361,8 @@ // finish of download/application of delta or patch download global void FinishPatchDeltaProvide () { - FinishLine (true); + if (last_callback != "DoneDownload") + FinishLine (false); last_callback = "FinishPatchDeltaProvide"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org