Author: lslezak
Date: Thu Jun 9 12:08:16 2011
New Revision: 64271
URL: http://svn.opensuse.org/viewcvs/yast?rev=64271&view=rev
Log:
move download_in_advance setting to PackageInstallation.ycp, use it in inst_rpmcopy.ycp
Modified:
branches/tmp/lslezak/SP2/packager/src/clients/inst_rpmcopy.ycp
branches/tmp/lslezak/SP2/packager/src/modules/PackageInstallation.ycp
branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp
Modified: branches/tmp/lslezak/SP2/packager/src/clients/inst_rpmcopy.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/packager/src/clients/inst_rpmcopy.ycp?rev=64271&r1=64270&r2=64271&view=diff
==============================================================================
--- branches/tmp/lslezak/SP2/packager/src/clients/inst_rpmcopy.ycp (original)
+++ branches/tmp/lslezak/SP2/packager/src/clients/inst_rpmcopy.ycp Thu Jun 9 12:08:16 2011
@@ -202,7 +202,15 @@
}
// returns [ int successful, list failed, list remaining ]
- list commit_result = PackageInstallation::CommitPackages( current_cd_no, 0 );
+ map config = $[ "medium_nr" : current_cd_no ];
+ if (PackageInstallation::DownloadInAdvance() == true)
+ {
+ config["download_mode"] = `download_in_advance;
+ }
+
+ y2milestone("Commit config: %1", config);
+
+ list commit_result = PackageInstallation::Commit(config);
if (commit_result == nil || size (commit_result) == 0)
{
@@ -437,8 +445,13 @@
// sync package manager FIXME
if (result != `abort && ! Stage::initial ())
{
- y2milestone ("Calling PkgCommit (%1)", 9999);
- Pkg::PkgCommit (9999);
+ map config = $[];
+ if (PackageInstallation::DownloadInAdvance() == true)
+ {
+ config["download_mode"] = `download_in_advance;
+ }
+ y2milestone ("Calling Pkg::Commit(%1)", config);
+ Pkg::Commit(config);
}
// BNC #443755
Modified: branches/tmp/lslezak/SP2/packager/src/modules/PackageInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/packager/src/modules/PackageInstallation.ycp?rev=64271&r1=64270&r2=64271&view=diff
==============================================================================
--- branches/tmp/lslezak/SP2/packager/src/modules/PackageInstallation.ycp (original)
+++ branches/tmp/lslezak/SP2/packager/src/modules/PackageInstallation.ycp Thu Jun 9 12:08:16 2011
@@ -21,6 +21,17 @@
import "Label";
+ boolean download_in_advance = nil;
+
+ global boolean DownloadInAdvance()
+ {
+ return download_in_advance;
+ }
+
+ global void SetDownloadInAdvance(boolean enable)
+ {
+ download_in_advance = enable;
+ }
global define any FakePackager( list<list> packages, string inst_source,
boolean deleting );
Modified: branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp?rev=64271&r1=64270&r2=64271&view=diff
==============================================================================
--- branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp (original)
+++ branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp Thu Jun 9 12:08:16 2011
@@ -32,6 +32,7 @@
import "FileUtils";
import "String";
import "Packages";
+ import "PackageInstallation";
boolean running_by_applet = false;
@@ -76,8 +77,6 @@
return update_workflow_type;
}
- global boolean download_in_advance = nil;
-
const string download_mode_link = "wagon-download_in_advance";
global define string GetDownloadModeLink()
@@ -442,12 +441,12 @@
global void ProposeDownloadMode()
{
- if (download_in_advance == nil)
+ if (PackageInstallation::DownloadInAdvance() == nil)
{
map dwspace = CheckDownloadSpace();
- download_in_advance = dwspace["result"]:nil == `ok;
- y2milestone("Proposed download in advance mode: %1", download_in_advance);
+ PackageInstallation::SetDownloadInAdvance(dwspace["result"]:nil == `ok);
+ y2milestone("Proposed download in advance mode: %1", PackageInstallation::DownloadInAdvance());
}
}
@@ -583,7 +582,7 @@
ret = "<ul>\n" + ret + "</ul>\n";
ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") +
- sformat("%2</a>", download_mode_link, (download_in_advance ? _("Enabled") : _("Disabled")))
+ sformat("%2</a>", download_mode_link, (PackageInstallation::DownloadInAdvance() ? _("Enabled") : _("Disabled")))
+ "</li></ul>\n";
map summary = $[
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
