r344 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Wed Nov 17 15:25:37 2004
New Revision: 344

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Backend.py
   branches/rewrite/src/Dists.py
   branches/rewrite/src/Pool.py
Log:
 r324@nurf:  otavio | 2004-11-17T22:23:38.402432Z
 Revert. I commited all together by mistake. Grrr!


Modified: branches/rewrite/src/Backend.py
==============================================================================
--- branches/rewrite/src/Backend.py	(original)
+++ branches/rewrite/src/Backend.py	Wed Nov 17 15:25:37 2004
@@ -24,7 +24,7 @@
 from Dists import *
 from PackageList import *
 from Package import *
-from Pool import *
+#from Pool import *
 
 class Backend:
     """
@@ -48,7 +48,7 @@
             self._dists = RemoteDists(self)
         elif isinstance(self._cfg.getBackend(self._name), ConfigBackendMerge):
             self._dists = LocalDists(self)
-        self._pool = Pool(self)
+        #self._pool = Pool(self)
 
     def __getitem__ (self, key):
         try:

Modified: branches/rewrite/src/Dists.py
==============================================================================
--- branches/rewrite/src/Dists.py	(original)
+++ branches/rewrite/src/Dists.py	Wed Nov 17 15:25:37 2004
@@ -77,6 +77,7 @@
         self._fill_files()
         for url, f in self._files:
             if os.path.basename(str(f)) != "Release":
+                self._dir.uncompress(f)
                 files.append(str(f.split('.gz')[0]))
         return files
 
@@ -90,15 +91,13 @@
     def update (self):
         """ Get only files that need updates """
         self._fill_files()
-        for server, filename in self._files:
+        for f in self._files:
+            server, filename = f
             self._dir.create(os.path.dirname(filename))
             Download().get(server, filename)
 
         for d in Download().fetchers:
             d.join()
-
-        for server, filename in self._files:
-            self._dir.uncompress(filename)
             
 class LocalDists (Dists):
     """

Modified: branches/rewrite/src/Pool.py
==============================================================================
--- branches/rewrite/src/Pool.py	(original)
+++ branches/rewrite/src/Pool.py	Wed Nov 17 15:25:37 2004
@@ -95,7 +95,7 @@
         """
         Download the Package p in 
         """
-        f = p['Filename']
+        f = p.['Filename']
         Download (self._server + f,
                   self.local + f)
 
@@ -112,7 +112,7 @@
         Link the Package p in the pool
         """
 
-        f = p['Filename']
+        f = p.['Filename']
         os.link (self._server + f,
                  self._local + f)