r359 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Mon Nov 22 17:43:15 2004
New Revision: 359

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Pool.py
Log:
 r358@nurf:  otavio | 2004-11-23T00:41:43.720390Z
 More near of Pool handle. We need to fix it because it is identifying only one package to get.


Modified: branches/rewrite/src/Pool.py
==============================================================================
--- branches/rewrite/src/Pool.py	(original)
+++ branches/rewrite/src/Pool.py	Mon Nov 22 17:43:15 2004
@@ -33,10 +33,8 @@
 
     def __init__(self, backend):
         self._backend = backend
-        #self._backendBinList = backend._bin
-        #self._backendSourceList = backend._source
-        self._gotFiles = ()
-        self._plist = {}
+        self._gotFiles = []
+        self._plist = []
         self._dir = FileSystem(backend["mirror_dir"],
                                os.path.join(backend["name"], 'pool'))
         self._server = "%s/" % (self._backend["server"])
@@ -54,25 +52,25 @@
             localName = pkg['Filename']
 
             if not os.path.exists (os.path.join (self._local,localName)):
-                self._plist[pkgName] = pkg
+                self._plist.append(pkg)
 
             elif self._dir.md5_on (localName) == pkg['md5sum']:
                     self._gotFiles.append(localName)
             else:
-                self._plist[pkgName] = pkg
+                self._plist.append(pkg)
 
         #Print some output.. maybe a list of packages to download and
         #total size..
         print "This packages need to be downloaded:"
-        for p in self._plist.keys():
+        for p in self._plist:
             print "%s \n" % (pkg['Filename'])
 
-    def upgrade (self, binList, srcList):
+    def upgrade (self):
         """
         Manage the pool upgrade process
         """
-        self.binUpdates (binList)
-        #self.srcUpdates (srcList)
+        self.binUpdates (self._backend.getBinList())
+        #self.srcUpdates (self._backend.getSrcList())
         self._upgrade ()
 
 
@@ -81,10 +79,10 @@
         Get from remote (or local) repository new version of packages
         that were previously downloaded.
         """
-        for (p, pkg) in self._plist.items():
-            self._dir.create(os.path.dirname(pkg['Filename']))
-            self._get(pkg)
-            self.gotFiles.append(pkg['Filename'])
+        for p in self._plist:
+            self._dir.create(os.path.dirname(p['Filename']))
+            self._get(p)
+            self._gotFiles.append(p['Filename'])
 
     def _get (self, pkg):
         """