Mailinglist Archive: zypp-commit (545 mails)

[dmacvicar@xxxxxxxxxxxxxxxx]

Author: dmacvicar
Date: Tue Feb  5 16:16:05 2008
New Revision: 8476

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8476&view=rev
Log:
use new load function

Modified:
    branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc
    branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
    branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc
    branches/tmp/ma/jump_sat/zypper/src/zypper-utils.cc

Modified: branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc?rev=8476&r1=8475&r2=8476&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypp-checkpatches.cc Tue Feb  5 
16:16:05 2008
@@ -225,10 +225,8 @@
   
   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 @@
     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;

Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc?rev=8476&r1=8475&r2=8476&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-misc.cc Tue Feb  5 16:16:05 2008
@@ -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 @@
   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 @@
     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")

Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc?rev=8476&r1=8475&r2=8476&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-repos.cc Tue Feb  5 16:16:05 2008
@@ -1273,9 +1273,8 @@
         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)
     {

Modified: branches/tmp/ma/jump_sat/zypper/src/zypper-utils.cc
URL: 
http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/zypper/src/zypper-utils.cc?rev=8476&r1=8475&r2=8476&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/zypper/src/zypper-utils.cc (original)
+++ branches/tmp/ma/jump_sat/zypper/src/zypper-utils.cc Tue Feb  5 16:16:05 2008
@@ -81,8 +81,6 @@
 {
   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 @@
     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)

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx