Author: locilka Date: Wed Oct 29 17:06:23 2008 New Revision: 52694 URL: http://svn.opensuse.org/viewcvs/yast?rev=52694&view=rev Log: - Storing sources when restarting or correctly finishing wagon. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=52694&r1=52693&r2=52694&view=diff ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 17:06:23 2008 @@ -6,6 +6,7 @@ - Remembering and reusing adjusted wagon workflow. - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. +- Storing sources when restarting or correctly finishing wagon. ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka@suse.cz Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=52694&r1=52693&r2=52694&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Oct 29 17:06:23 2008 @@ -25,6 +25,7 @@ import "Wagon"; import "CommandLine"; import "PackageLock"; + import "PackageCallbacks"; textdomain "wagon"; @@ -90,11 +91,17 @@ y2milestone ("YaST will be restarted starting from the very next step: %1", next_step); SCR::Write (.target.ycp, current_step_file, next_step); + // Also the current workflow type has to be stored string current_workflow = Wagon::GetUpdateWorkflow(); y2milestone ("Current workflow is '%1'", current_workflow); SCR::Write (.target.ycp, current_workflow_file, current_workflow); } } + + if (ret == `restart_same_step || ret == `restart_yast || ret == `reboot || ret == `accept || ret == `next) { + y2milestone ("Storing all the current sources..."); + Pkg::SourceSaveAll(); + } } // Checks whether YaST has been restarted Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=52694&r1=52693&r2=52694&view=diff ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Oct 29 17:06:23 2008 @@ -265,8 +265,10 @@ return true; } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (GetUpdateConf()); - y2milestone ("Update summary: %1", update_sum); + map <string, any> update_conf = GetUpdateConf(); + + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); already_proposed = true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org