Author: lslezak Date: Mon Aug 1 13:33:18 2011 New Revision: 65100 URL: http://svn.opensuse.org/viewcvs/yast?rev=65100&view=rev Log: - Pkg::SourceFinishAll() - remove upgrading repositories from the solver, fixes solver crash when called later (bnc#709494) - 2.17.45.2 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION?rev=65100&r1=65099&r2=65100&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Mon Aug 1 13:33:18 2011 @@ -1 +1 @@ -2.17.45.1 +2.17.45.2 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes?rev=65100&r1=65099&r2=65100&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Mon Aug 1 13:33:18 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 1 09:28:55 UTC 2011 - lslezak@suse.cz + +- Pkg::SourceFinishAll() - remove upgrading repositories from the + solver, fixes solver crash when called later (bnc#709494) +- 2.17.45.2 + +------------------------------------------------------------------- Tue Jul 19 19:43:23 UTC 2011 - lslezak@suse.cz - added Pkg::Add/RemoveUpgradeRepo() and Pkg::GetUpgradeRepos() Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc?rev=65100&r1=65099&r2=65100&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc Mon Aug 1 13:33:18 2011 @@ -244,6 +244,7 @@ * @description * Release all known installation repositories. Releasing is done automaticaly in Pkg:: * destructor, but can be done explicitly to force reloading of registered repositories. + * Upgrade repositories are automatically removed from the solver. * Use SourceSaveAll() to not loose the new registered sources before calling SourceFinishAll()! * @return boolean true on success **/ @@ -261,6 +262,16 @@ RemoveResolvablesFrom((*it)->repoInfo().alias()); } + // remove all upgrading repositories from the solver before destructing them + for_(it, zypp::ResPool::instance().knownRepositoriesBegin(), zypp::ResPool::instance().knownRepositoriesEnd()) + { + if (zypp_ptr()->resolver()->upgradingRepo(*it)) + { + y2milestone("Removing upgrade repository '%s' (%s)", it->name().c_str(), it->alias().c_str()); + zypp_ptr()->resolver()->removeUpgradeRepo(*it); + } + } + // release all repositories repos.clear(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org