From: Michael Andres <ma@suse.de>
Date: Fri, 6 Jun 2008 13:40:04 +0000 (+0000)
Subject: s/systemRepoName/systemRepoAlias/
X-Git-Tag: 6.6.0~799
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13f6fbc0099817051d7f4fbf88d77ae8046c4e83;p=platform%2Fupstream%2Flibzypp.git

s/systemRepoName/systemRepoAlias/
---

diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc
index 51a9fc932..25ae5c216 100644
--- a/zypp/PoolQuery.cc
+++ b/zypp/PoolQuery.cc
@@ -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;
diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index a66460032..d28c312b5 100644
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -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() );