r355 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Fri Nov 19 18:14:06 2004
New Revision: 355

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Dists.py
Log:
 r352@nurf:  otavio | 2004-11-20T01:13:45.422280Z
 Change dir attribut to fs and private; Fix some small errors after move upgrade to here.


Modified: branches/rewrite/src/Dists.py
==============================================================================
--- branches/rewrite/src/Dists.py	(original)
+++ branches/rewrite/src/Dists.py	Fri Nov 19 18:14:06 2004
@@ -28,6 +28,7 @@
 from FileSystem import *
 from Package import *
 from PackageList import *
+from Config import InvalidOption
 
 class Dists:
     """
@@ -37,7 +38,7 @@
     def __init__ (self, backend):
         self._backend = backend
         self._files = []
-        self._dir = FileSystem(backend["mirror_dir"], backend["name"])
+        self.__fs = FileSystem(backend["mirror_dir"], backend["name"])
 
         # Package lists
         self.__bin = PackageList()
@@ -106,7 +107,7 @@
 
         pkgfilter = []
         try:
-            pkgfilter = self._cfg.getOption('filter', self._name)
+            pkgfilter = self._backend._cfg.getOption('filter', self._backend._name)
         except InvalidOption:
             pass
 
@@ -137,7 +138,7 @@
         """ Get only files that need updates """
         self._fill_files()
         for server, filename in self._files:
-            self._dir.create(os.path.dirname(filename))
+            self.__fs.create(os.path.dirname(filename))
             Download().get(server, filename)
 
         for d in Download().fetchers:
@@ -145,7 +146,7 @@
 
         for server, filename in self._files:
             if os.path.basename(str(filename)) != "Release":
-                self._dir.uncompress(filename)
+                self.__fs.uncompress(filename)
             
 class LocalDists (Dists):
     """
@@ -160,6 +161,6 @@
         for f in self._files:
             server, filename = f
             orig, filename = file
-            self._dir.create(os.path.dirname(filename))
+            self.__fs.create(os.path.dirname(filename))
             os.link (orig.split('file://')[1], filename)