Author: lslezak
Date: Tue Jun 14 14:00:22 2011
New Revision: 64343
URL: http://svn.opensuse.org/viewcvs/yast?rev=64343&view=rev
Log:
- implemented download in advance mode support (fate#308951)
- 2.21.0
Modified:
trunk/wagon/ (props changed)
trunk/wagon/VERSION
trunk/wagon/package/yast2-wagon.changes
trunk/wagon/src/clients/wagon_update_proposal.ycp
trunk/wagon/src/config/cd_update.desktop (props changed)
trunk/wagon/src/modules/Wagon.ycp (contents, props changed)
trunk/wagon/yast2-wagon.spec.in
Modified: trunk/wagon/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=64343&r1=64342&r2=64343&view=diff
==============================================================================
--- trunk/wagon/VERSION (original)
+++ trunk/wagon/VERSION Tue Jun 14 14:00:22 2011
@@ -1 +1 @@
-2.20.3
+2.21.0
Modified: trunk/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=64343&r1=64342&r2=64343&view=diff
==============================================================================
--- trunk/wagon/package/yast2-wagon.changes (original)
+++ trunk/wagon/package/yast2-wagon.changes Tue Jun 14 14:00:22 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jun 14 08:42:02 UTC 2011 - lslezak@suse.cz
+
+- implemented download in advance mode support (fate#308951)
+- 2.21.0
+
+-------------------------------------------------------------------
Fri Feb 18 14:22:27 CET 2011 - locilka@suse.cz
- yast2-wagon control files have been moved to separate packages
Modified: trunk/wagon/src/clients/wagon_update_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_update_proposal.ycp?rev=64343&r1=64342&r2=64343&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_update_proposal.ycp (original)
+++ trunk/wagon/src/clients/wagon_update_proposal.ycp Tue Jun 14 14:00:22 2011
@@ -20,6 +20,7 @@
import "Wagon";
import "Report";
+ import "PackageInstallation";
string func = (string) WFM::Args(0);
map param = (map) WFM::Args(1);
@@ -40,11 +41,23 @@
}
Wagon::ProposeDUP();
+ Wagon::ProposeDownloadMode();
ret = Wagon::ProposalSummary();
} else if (func == "AskUser") {
- Report::Message (_("There is nothing to set."));
+ string chosen_id = param["chosen_id"]:"";
+
+ // toggle the download mode status
+ if (chosen_id == Wagon::GetDownloadModeLink())
+ {
+ PackageInstallation::SetDownloadInAdvance(!PackageInstallation::DownloadInAdvance());
+ }
+ else
+ {
+ Report::Message (_("There is nothing to set."));
+ }
+
ret = $[ "workflow_sequence" : `next ];
} else if (func == "Description") {
Modified: trunk/wagon/src/modules/Wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=64343&r1=64342&r2=64343&view=diff
==============================================================================
--- trunk/wagon/src/modules/Wagon.ycp (original)
+++ trunk/wagon/src/modules/Wagon.ycp Tue Jun 14 14:00:22 2011
@@ -31,6 +31,8 @@
import "Update";
import "FileUtils";
import "String";
+ import "Packages";
+ import "PackageInstallation";
boolean running_by_applet = false;
@@ -75,6 +77,13 @@
return update_workflow_type;
}
+ const string download_mode_link = "wagon-download_in_advance";
+
+ global define string GetDownloadModeLink()
+ {
+ return download_mode_link;
+ }
+
string migration_method = nil;
global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir);
@@ -379,6 +388,68 @@
return true;
}
+ string FindMountPoint(string dir, list<string> dirs)
+ {
+ while (dir != nil && dir != "" && !contains(dirs, dir))
+ {
+ // strip the last path component and try it again
+ list<string> comps = splitstring(dir, "/");
+ comps = remove(comps, size(comps) - 1);
+ dir = mergestring(comps, "/");
+ }
+
+ return dir;
+ }
+
+ map