Author: jsuchome Date: Mon Nov 19 16:43:16 2007 New Revision: 42177 URL: http://svn.opensuse.org/viewcvs/yast?rev=42177&view=rev Log: - reload the target before checking for new patches (#232247) - use a correct way for restarting during installation (#281818) - 2.13.63 (merged from SP1:) - fix check for nil return value of clients (#339749) - 2.13.62 - use PkgTaboo instead of ResolvableNeutral if the package with declined license should not be installed (#279491) - run PkgSolve after those PkgTaboo and open package selector for user interaction if Solver fails (#279491) - 2.13.61 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes branches/SuSE-SLE-10-SP2-Branch/online-update/src/inst_you.ycp branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION?rev=42177&r1=42176&r2=42177&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/VERSION Mon Nov 19 16:43:16 2007 @@ -1 +1 @@ -2.13.60 +2.13.63 Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes?rev=42177&r1=42176&r2=42177&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/package/yast2-online-update.changes Mon Nov 19 16:43:16 2007 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Mon Nov 19 16:19:30 CET 2007 - jsuchome@suse.cz + +- reload the target before checking for new patches (#232247) +- use a correct way for restarting during installation (#281818) +- 2.13.63 + +------------------------------------------------------------------- +Thu Nov 8 11:16:09 CET 2007 - jsuchome@suse.cz + +- fix check for nil return value of clients (#339749) +- 2.13.62 + +------------------------------------------------------------------- +Fri Jun 8 09:05:04 CEST 2007 - jsuchome@suse.cz + +- use PkgTaboo instead of ResolvableNeutral if the package with + declined license should not be installed (#279491) +- run PkgSolve after those PkgTaboo and open package selector for + user interaction if Solver fails (#279491) +- 2.13.61 + +------------------------------------------------------------------- Thu May 31 21:03:08 CEST 2007 - jsuchome@suse.cz - when the package selector is skipped, check if there are not Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/src/inst_you.ycp?rev=42177&r1=42176&r2=42177&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/src/inst_you.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/src/inst_you.ycp Mon Nov 19 16:43:16 2007 @@ -23,7 +23,7 @@ import "Wizard"; string saved_path = Directory::vardir + "/selected_patches.ycp"; - string restart_data_file = Directory::vardir + "/continue_installation"; + string restarted_path = Directory::vardir + "/continue_you"; /* Called backwards */ if(GetInstArgs::going_back()) @@ -33,16 +33,11 @@ } boolean after_restart = false; - if (FileUtils::Exists (restart_data_file)) + if (FileUtils::Exists (restarted_path)) { - map restarting_step = ProductControl::RestartingStep (); - y2milestone ("restarting_step: %1", restarting_step); - if (restarting_step == nil || // 'fix' for bug #184452 - restarting_step["name"]:"" == "you") - { - y2milestone ("installation restarted from YOU"); - after_restart = true; - } + y2milestone ("installation restarted from YOU"); + SCR::Execute (.target.remove, restarted_path); + after_restart = true; } if (!Internet::do_you && !after_restart) // nothing to do @@ -113,10 +108,15 @@ // otherwise it was already done in inst_ask_online_update.ycp) Pkg::PkgEstablish (); } + else // reinitialize target after release notes were read (#232247) + { + Pkg::TargetFinish (); + Pkg::TargetInitialize ("/"); + Pkg::TargetLoad (); + } integer selected = 0; boolean check_licenses = false; - list neutralized = []; // check if there exists saved selection of patches to be installed if (FileUtils::Exists (saved_path)) @@ -216,6 +216,7 @@ // if the package selector was not opened, ask to confirm licenses if (check_licenses) { + boolean rejected = false; foreach (string p, Pkg::GetPackages (`selected, true), { string license = Pkg::PkgGetLicenseToConfirm (p); if (license != nil && license != "") @@ -230,8 +231,8 @@ `focus_none)) { y2milestone("License not accepted: %1", p); - Pkg::ResolvableNeutral (p, `package, true); - neutralized = add (neutralized, p); + Pkg::PkgTaboo (p); + rejected = true; } else { @@ -239,25 +240,17 @@ } } }); - if (neutralized != []) + // we must run solver again and offer manual intervention if it fails + if (rejected && !Pkg::PkgSolve (true)) { - // now, neutralize also the patches related to neutralized packages - foreach (map patch, Pkg::ResolvableDependencies ("", `patch, ""), { - if (patch["status"]:`none == `selected) - { - foreach (map dep, (list<map>)patch["dependencies"]:[], { - string kind = dep["res_kind"]:""; - string pname = dep["name"]:""; - pname = substring (pname, 0, findfirstof (pname, " ")); - if ((kind == "package" || kind == "atom") && - dep["dep_kind"]:"" == "requires" && - contains (neutralized, pname)) - { - Pkg::ResolvableNeutral (patch["name"]:"", `patch, true); - } - }); - } - }); + UI::OpenDialog (`opt (`defaultsize), `PackageSelector (`id(`selector), `opt(`youMode))); + symbol ret_sel = (symbol)UI::RunPkgSelection (`id (`selector)); + UI::CloseDialog (); + if (ret_sel == `cancel) + { + y2milestone ("package selector canceled -> `next"); + return `next; + } } } // install the patches @@ -274,6 +267,7 @@ else if (ret == `restart_same_step) { Popup::Message (OnlineUpdate::restart_message); + SCR::Write (.target.ycp, restarted_path, 1); } if (!already_up) Modified: branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp?rev=42177&r1=42176&r2=42177&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/online-update/src/online_update.ycp Mon Nov 19 16:43:16 2007 @@ -138,7 +138,7 @@ result = WFM::CallFunction( module_name, module_args ); - if ( result == `nil ) return 1; + if ( result == nil ) return 1; if (result == `again ) continue; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org