Author: lslezak
Date: Mon Jun 6 15:14:08 2011
New Revision: 64223
URL: http://svn.opensuse.org/viewcvs/yast?rev=64223&view=rev
Log:
first step - propose download in advance mode according to free disk
space, display the result in the migration proposal
Modified:
branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp
branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp
Modified: branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp?rev=64223&r1=64222&r2=64223&view=diff
==============================================================================
--- branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp (original)
+++ branches/tmp/lslezak/SP2/wagon/src/clients/wagon_update_proposal.ycp Mon Jun 6 15:14:08 2011
@@ -40,6 +40,7 @@
}
Wagon::ProposeDUP();
+ Wagon::ProposeDownloadMode();
ret = Wagon::ProposalSummary();
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=64223&r1=64222&r2=64223&view=diff
==============================================================================
--- branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp (original)
+++ branches/tmp/lslezak/SP2/wagon/src/modules/Wagon.ycp Mon Jun 6 15:14:08 2011
@@ -31,6 +31,7 @@
import "Update";
import "FileUtils";
import "String";
+ import "Packages";
boolean running_by_applet = false;
@@ -75,6 +76,8 @@
return update_workflow_type;
}
+ global boolean download_in_advance = nil;
+
string migration_method = nil;
global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir);
@@ -379,6 +382,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