Author: mlandres Date: Fri Jun 6 15:40:04 2008 New Revision: 10363 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10363&view=rev Log: s/systemRepoName/systemRepoAlias/ Modified: trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=10363&r1=10362&r2=10363&view=diff ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Fri Jun 6 15:40:04 2008 @@ -649,7 +649,7 @@ // whether to drop an uninstalled (repo) solvable if ( (_status_flags & PoolQuery::INSTALLED_ONLY) && - base().get()->repo->name != sat::Pool::instance().systemRepoName() ) + base().get()->repo->name != sat::Pool::instance().systemRepoAlias() ) { drop_by_kind_status_edition = true; break; @@ -657,7 +657,7 @@ // whether to drop an installed (target) solvable if ((_status_flags & PoolQuery::UNINSTALLED_ONLY) && - base().get()->repo->name == sat::Pool::instance().systemRepoName()) + base().get()->repo->name == sat::Pool::instance().systemRepoAlias()) { drop_by_kind_status_edition = true; break; Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=10363&r1=10362&r2=10363&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Fri Jun 6 15:40:04 2008 @@ -302,14 +302,14 @@ void TargetImpl::clearCache() { Pathname base = Pathname::assertprefix( _root, - ZConfig::instance().repoSolvfilesPath() / sat::Pool::instance().systemRepoName() ); + ZConfig::instance().repoSolvfilesPath() / sat::Pool::instance().systemRepoAlias() ); filesystem::recursive_rmdir( base ); } void TargetImpl::buildCache() { Pathname base = Pathname::assertprefix( _root, - ZConfig::instance().repoSolvfilesPath() / sat::Pool::instance().systemRepoName() ); + ZConfig::instance().repoSolvfilesPath() / sat::Pool::instance().systemRepoAlias() ); Pathname rpmsolv = base/"solv"; Pathname rpmsolvcookie = base/"cookie"; @@ -406,8 +406,8 @@ // now add the repos to the pool sat::Pool satpool( sat::Pool::instance() ); Pathname rpmsolv( Pathname::assertprefix( _root, - ZConfig::instance().repoSolvfilesPath() / satpool.systemRepoName() / "solv" ) ); - MIL << "adding " << rpmsolv << " to pool(" << satpool.systemRepoName() << ")" << endl; + ZConfig::instance().repoSolvfilesPath() / satpool.systemRepoAlias() / "solv" ) ); + MIL << "adding " << rpmsolv << " to pool(" << satpool.systemRepoAlias() << ")" << endl; // Providing an empty system repo, unload any old content Repository system( sat::Pool::instance().findSystemRepo() ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org