Hello community, here is the log from the commit of package yast2-wagon checked in at Thu Oct 30 15:23:15 CET 2008. -------- --- yast2-wagon/yast2-wagon.changes 2008-10-27 17:11:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes 2008-10-29 17:39:30.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Oct 29 16:41:12 CET 2008 - locilka@suse.cz + +- Restarting the very next step instead of the same step in case of + restarting wagon after self-update (prevents from loop). +- 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. +- 2.17.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.17.3.tar.bz2 New: ---- yast2-wagon-2.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.R12165/_old 2008-10-30 15:21:16.000000000 +0100 +++ /var/tmp/diff_new_pack.R12165/_new 2008-10-30 15:21:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-wagon (Version 2.17.3) +# spec file for package yast2-wagon (Version 2.17.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,18 +19,18 @@ Name: yast2-wagon -Version: 2.17.3 +Version: 2.17.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.17.3.tar.bz2 +Source0: yast2-wagon-2.17.4.tar.bz2 Prefix: /usr # Possibility to restart YaST Requires: yast2 >= 2.17.33 -Requires: yast2-online-update >= 2.17.9 +Requires: yast2-online-update-frontend >= 2.17.9 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -Provides: yast2-online-update:/usr/share/applications/YaST2/cd_update.desktop +Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop BuildArch: noarch Summary: YaST2 - Migration Tool for Service Packs @@ -46,7 +46,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-wagon-2.17.3 +%setup -n yast2-wagon-2.17.4 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,14 @@ /usr/share/YaST2/control/online_migration.xml %doc %{prefix}/share/doc/packages/yast2-wagon %changelog +* Wed Oct 29 2008 locilka@suse.cz +- Restarting the very next step instead of the same step in case of + restarting wagon after self-update (prevents from loop). +- 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. +- 2.17.4 * Mon Oct 27 2008 locilka@suse.cz - Calling inst_prepareprogress before inst_kickoff (bnc #438848). - 2.17.3 ++++++ yast2-wagon-2.17.3.tar.bz2 -> yast2-wagon-2.17.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.3/src/clients/wagon_selfupdate.ycp new/yast2-wagon-2.17.4/src/clients/wagon_selfupdate.ycp --- old/yast2-wagon-2.17.3/src/clients/wagon_selfupdate.ycp 2008-10-22 19:13:55.000000000 +0200 +++ new/yast2-wagon-2.17.4/src/clients/wagon_selfupdate.ycp 2008-10-29 15:58:44.000000000 +0100 @@ -164,6 +164,7 @@ } } + y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; @@ -178,10 +179,12 @@ // PkgSolve didn't report any problem if (solved) { + y2milestone ("Solved automatically"); // FIXME: inform user? ret = `restart_same_step; // There are some issues in selecting the patches } else { + y2milestone ("Cannot be solved automatically"); while (true) { // Try to solve them manually UI::OpenDialog(`opt(`defaultsize), `PackageSelector (`id(`selector), `opt(`summaryMode))); @@ -209,7 +212,7 @@ } // Solved manually } else if (ret_sel == `accept) { - ret = `restart_same_step; + solved = true; break; } } @@ -228,11 +231,20 @@ } if (solved == true) { - y2milestone ("Calling update..."); - OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); - any ret = WFM::call ("online_update_install"); - y2milestone ("Update returned: %1", ret); + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Calling update..."); + OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); + any oui_ret = WFM::call ("online_update_install"); + y2milestone ("Update returned: %1", oui_ret); + ret = `restart_same_step; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } } + y2milestone ("Returning: %1", ret); + return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.3/src/clients/wagon_update_proposal.ycp new/yast2-wagon-2.17.4/src/clients/wagon_update_proposal.ycp --- old/yast2-wagon-2.17.3/src/clients/wagon_update_proposal.ycp 2008-10-17 13:05:22.000000000 +0200 +++ new/yast2-wagon-2.17.4/src/clients/wagon_update_proposal.ycp 2008-10-29 16:40:48.000000000 +0100 @@ -26,6 +26,9 @@ map <string, any> ret = $[]; if (func == "MakeProposal") { + // Make sure the packager is initialized + Wagon::InitPkg(); + boolean force_reset = param["force_reset" ]:false; boolean language_changed = param["language_changed"]:false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.3/src/clients/wagon.ycp new/yast2-wagon-2.17.4/src/clients/wagon.ycp --- old/yast2-wagon-2.17.3/src/clients/wagon.ycp 2008-10-16 15:41:45.000000000 +0200 +++ new/yast2-wagon-2.17.4/src/clients/wagon.ycp 2008-10-29 16:56:32.000000000 +0100 @@ -25,6 +25,7 @@ import "Wagon"; import "CommandLine"; import "PackageLock"; + import "PackageCallbacks"; textdomain "wagon"; @@ -45,7 +46,11 @@ string do_restart = Directory::vardir + "/restart_yast"; - string current_step_file = Directory::vardir + "/current_workflow_step"; + // Start workflow from step ... + string current_step_file = Directory::vardir + "/wagon-current_workflow_step"; + // Start with workflow + string current_workflow_file = Directory::vardir + "/wagon-current_workflow_file"; + integer current_step = 0; string custom_workflow_file = "/usr/share/YaST2/control/online_migration.xml"; @@ -78,10 +83,25 @@ if (ret == `restart_same_step) { current_step = ProductControl::CurrentStep(); - y2milestone ("The same step will be restarted: %1", current_step); - SCR::Write (.target.ycp, current_step_file, current_step); + // We actually don't want to restart the same step, we want to continue + // directly with the very next step + // + // The current step + 1 == the very next step + integer next_step = current_step + 1; + 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 @@ -102,6 +122,18 @@ y2milestone ("Adjusting starting step: %1", current_step); } } + + if (FileUtils::Exists (current_workflow_file)) { + string workflow_type = (string) SCR::Read (.target.ycp, current_workflow_file); + SCR::Execute (.target.remove, current_workflow_file); + + if (workflow_type == nil || workflow_type == "") { + y2error ("Requested workflow type is invalid: %1", workflow_type); + } else { + y2milestone ("Adjusting required workflow type: %1", workflow_type); + Wagon::SetUpdateWorkflow (workflow_type); + } + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.3/src/modules/Wagon.ycp new/yast2-wagon-2.17.4/src/modules/Wagon.ycp --- old/yast2-wagon-2.17.3/src/modules/Wagon.ycp 2008-10-17 14:09:58.000000000 +0200 +++ new/yast2-wagon-2.17.4/src/modules/Wagon.ycp 2008-10-29 17:04:39.000000000 +0100 @@ -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; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-wagon-2.17.3/VERSION new/yast2-wagon-2.17.4/VERSION --- old/yast2-wagon-2.17.3/VERSION 2008-10-27 17:17:46.000000000 +0100 +++ new/yast2-wagon-2.17.4/VERSION 2008-10-29 17:39:23.000000000 +0100 @@ -1 +1 @@ -2.17.3 +2.17.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org