s/systemRepoName/systemRepoAlias/
authorMichael Andres <ma@suse.de>
Fri, 6 Jun 2008 13:40:04 +0000 (13:40 +0000)
committerMichael Andres <ma@suse.de>
Fri, 6 Jun 2008 13:40:04 +0000 (13:40 +0000)
zypp/PoolQuery.cc
zypp/target/TargetImpl.cc

index 51a9fc932de5d2b6eeb9ead56025dcc99eafc985..25ae5c2160aed734c49cc2cfee2d33e2161bb67e 100644 (file)
@@ -649,7 +649,7 @@ attremptycheckend:
 
           // 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 @@ attremptycheckend:
 
           // 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;
index a66460032fe0df7381c7ccecdcd3a11209f1f19a..d28c312b5efefdfacc8f32d2fa1c98a49d9004cc 100644 (file)
@@ -302,14 +302,14 @@ namespace zypp
     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 @@ namespace zypp
       // 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() );