ref: refs/heads/SuSE-Code-11-Branch
commit 696e32924d086bc2993befc64117493fb6f4f985
Author: Michael Andres
Date: Wed May 20 14:11:48 2009 +0200
Fix lost housekeeping data in modifyRepo (bnc #503207)
---
zypp/RepoManager.cc | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index f926001..55c624b 100644
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -1511,19 +1511,16 @@ namespace zypp
////////////////////////////////////////////////////////////////////////////
void RepoManager::modifyRepository( const std::string &alias,
- const RepoInfo & newinfo,
+ const RepoInfo & newinfo_r,
const ProgressData::ReceiverFnc & progressrcv )
{
RepoInfo toedit = getRepositoryInfo(alias);
+ RepoInfo newinfo( newinfo_r ); // need writable copy to upadte housekeeping data
// check if the new alias already exists when renaming the repo
- if (alias != newinfo.alias())
+ if ( alias != newinfo.alias() && hasRepo( newinfo.alias() ) )
{
- for_( it, repoBegin(), repoEnd() )
- {
- if ( newinfo.alias() == (*it).alias() )
- ZYPP_THROW(RepoAlreadyExistsException(newinfo));
- }
+ ZYPP_THROW(RepoAlreadyExistsException(newinfo));
}
if (toedit.filepath().empty())
@@ -1561,6 +1558,7 @@ namespace zypp
newinfo.dumpAsIniOn(file);
}
+ newinfo.setFilepath(toedit.filepath());
_pimpl->repos.erase(toedit);
_pimpl->repos.insert(newinfo);
HistoryLog(_pimpl->options.rootDir).modifyRepository(toedit, newinfo);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Michael Andres