Author: lslezak Date: Thu Jul 28 22:55:11 2011 New Revision: 65082 URL: http://svn.opensuse.org/viewcvs/yast?rev=65082&view=rev Log: improved package manager reset function: - no need to neutralize selected resolvables, after pool reload the status is reset anyway - reset also solver options and DUP repositories Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp?rev=65082&r1=65081&r2=65082&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/include/common_func.ycp Thu Jul 28 22:55:11 2011 @@ -126,24 +126,23 @@ ); y2milestone ("Reseting Pkg"); - Pkg::PkgApplReset(); - Pkg::PkgReset(); - symbol status = nil; - string name = nil; + list<integer> repos = Pkg::GetUpgradeRepos(); + if (size(repos) > 0) + { + y2milestone("Resetting upgrade repos config"); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + } - y2milestone ("Neutralizing all resolvables"); - foreach (symbol resolvable, [`pattern, `patch, `package, `product, `srcpackage], { - Pkg::ResolvableNeutral ("" /* all */, resolvable, true /* force */); - }); - - y2milestone ("Running solver"); - Pkg::PkgSolve (true); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); Pkg::TargetFinish(); Pkg::SourceFinishAll(); Wagon::InitPkg(); + + y2milestone ("Running solver"); Pkg::PkgSolve (true); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org