From bce01b9056e01417e91a6939ae13d02a0f507544 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Tue, 5 Feb 2008 15:16:05 +0000
Subject: [PATCH] use new load function

---
 src/zypp-checkpatches.cc | 11 +++--------
 src/zypper-misc.cc       |  6 +-----
 src/zypper-repos.cc      |  5 ++---
 src/zypper-utils.cc      |  4 ----
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/zypp-checkpatches.cc b/src/zypp-checkpatches.cc
index ddddf29..ef37fcc 100644
--- a/src/zypp-checkpatches.cc
+++ b/src/zypp-checkpatches.cc
@@ -225,10 +225,8 @@ int main(int argc, char **argv)
   
   for ( std::list<RepoInfo>::const_iterator it = repos.begin(); it != repos.end(); ++it )
   {
-    Repository repository = manager.createFromCache(*it);
-    // FIXME fow now this will add repository resolvables
-    repository.resolvables();
-    //God->addResolvables();
+    // load into the pool
+    manager.loadFromCache(it->alias());
   }
 
   if ( repos.size() == 0 )
@@ -236,11 +234,8 @@ int main(int argc, char **argv)
     errors.push_back( str::form( _( "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates.") ) );
   }
 
+  // load into the pool
   God->target()->load();
-  //God->addResolvables( God->target()->resolvables(), true);
-  
-  // FIXME no need to establish?
-  //God->resolver()->establishPool();
   
   int count = 0;
   int security_count = 0;
diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index f5791a8..1bb62cb 100644
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -19,7 +19,7 @@
 
 #include "zypp/RepoInfo.h"
 
-//#include "zypp/CapFactory.h"
+#include "zypp/Capabilities.h"
 
 #include "zypp/target/store/xml_escape_parser.hpp"
 
@@ -75,8 +75,6 @@ ResObject::Kind string_to_kind (const string &skind)
   string lskind = str::toLower (skind);
   if (lskind == "package")
     return ResTraits<Package>::kind;
-  if (lskind == "selection")
-    return ResTraits<Selection>::kind;
   if (lskind == "pattern")
     return ResTraits<Pattern>::kind;
   if (lskind == "product")
@@ -87,8 +85,6 @@ ResObject::Kind string_to_kind (const string &skind)
     return ResTraits<Script>::kind;
   if (lskind == "message")
     return ResTraits<Message>::kind;
-  if (lskind == "language")
-    return ResTraits<Language>::kind;
   if (lskind == "atom")
     return ResTraits<Atom>::kind;
 //   if (lskind == "system")
diff --git a/src/zypper-repos.cc b/src/zypper-repos.cc
index e9e6c14..52de5c1 100644
--- a/src/zypper-repos.cc
+++ b/src/zypper-repos.cc
@@ -1273,9 +1273,8 @@ void load_repo_resolvables(Zypper & zypper)
         continue;
       }
 
-      Repository repository(manager.createFromCache(repo));
-      ResStore store = repository.resolvables();
-      cout_v << " " << format(_("(%d resolvables found)")) % store.size() << endl;
+      manager.loadFromCache(repo.alias());
+      //cout_v << " " << format(_("(%d resolvables found)")) % store.size() << endl;
     }
     catch (const Exception & e)
     {
diff --git a/src/zypper-utils.cc b/src/zypper-utils.cc
index cbd57a1..d53a504 100644
--- a/src/zypper-utils.cc
+++ b/src/zypper-utils.cc
@@ -81,8 +81,6 @@ string kind_to_string_localized(const Resolvable::Kind & kind, unsigned long cou
 {
   if (kind == ResTraits<Package>::kind)
     return _PL("package", "packages", count);
-  if (kind == ResTraits<Selection>::kind)
-    return _PL("selection", "selections", count);
   if (kind == ResTraits<Pattern>::kind)
     return _PL("pattern", "patterns", count);
   if (kind == ResTraits<Product>::kind)
@@ -93,8 +91,6 @@ string kind_to_string_localized(const Resolvable::Kind & kind, unsigned long cou
     return _PL("script", "scripts", count);
   if (kind == ResTraits<Message>::kind)
     return _PL("message", "messages", count);
-  if (kind == ResTraits<Language>::kind)
-    return _PL("language", "languages", count);
   if (kind == ResTraits<Atom>::kind)
     return _PL("atom", "atoms", count);
 //   if (kind == ResTraits<SystemResObject>::kind)
-- 
2.7.4