Author: lslezak Date: Tue Jun 14 11:42:56 2011 New Revision: 64335 URL: http://svn.opensuse.org/viewcvs/yast?rev=64335&view=rev Log: merged missing commits Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp branches/SuSE-Code-11-SP2-Branch/pkg-bindings/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/ (props changed) branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp?rev=64335&r1=64334&r2=64335&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/SlideShowCallbacks.ycp Tue Jun 14 11:42:56 2011 @@ -447,7 +447,6 @@ global void StartDeltaProvide( string name, integer archivesize ) { PackageSlideShow::SlideGenericProvideStart (name , archivesize, _("Downloading delta RPM %1 (download size %2)"), true /*remote*/); - _remote_provide = true; } /** @@ -456,7 +455,6 @@ global void StartDeltaApply( string name ) { PackageSlideShow::SlideDeltaApplyStart (name); - _remote_provide = true; } /** * at start of file providal @@ -464,7 +462,6 @@ global void StartPatchProvide( string name, integer archivesize ) { PackageSlideShow::SlideGenericProvideStart (name , archivesize, _("Downloading patch RPM %1 (download size %2)"), true /*remote*/); - _remote_provide = true; } /** @@ -480,23 +477,19 @@ */ global void FinishPatchDeltaProvide() { - _remote_provide = false; } global void ProblemDeltaDownload (string descr) { - _remote_provide = false; // error in installation log, %1 is detail error description SlideShow::AppendMessageToInstLog (sformat (_("Failed to download delta RPM: %1"), descr)); } global void ProblemDeltaApply (string descr) { - _remote_provide = false; // error in installation log, %1 is detail error description SlideShow::AppendMessageToInstLog (sformat (_("Failed to apply delta RPM: %1"), descr)); } global void ProblemPatchDownload (string descr) { - _remote_provide = false; // error in installation log, %1 is detail error description SlideShow::AppendMessageToInstLog (sformat (_("Failed to download patch RPM: %1"), descr)); } Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp?rev=64335&r1=64334&r2=64335&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_update_proposal.ycp Tue Jun 14 11:42:56 2011 @@ -20,6 +20,7 @@ import "Wagon"; import "Report"; + import "PackageInstallation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -50,7 +51,7 @@ // toggle the download mode status if (chosen_id == Wagon::GetDownloadModeLink()) { - Wagon::download_in_advance = !Wagon::download_in_advance; + PackageInstallation::SetDownloadInAdvance(!PackageInstallation::DownloadInAdvance()); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org