r348 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Thu Nov 18 11:54:45 2004
New Revision: 348

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Backend.py
Log:
 r337@nurf:  otavio | 2004-11-18T18:45:07.686080Z
 Change to do not use builtin names as /list/ or /filter/ as variable names.


Modified: branches/rewrite/src/Backend.py
==============================================================================
--- branches/rewrite/src/Backend.py	(original)
+++ branches/rewrite/src/Backend.py	Thu Nov 18 11:54:45 2004
@@ -24,7 +24,7 @@
 from Dists import *
 from PackageList import *
 from Package import *
-#from Pool import *
+from Pool import *
 
 class Backend:
     """
@@ -48,13 +48,13 @@
             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:
             item = self._cfg.getOption(key, self._name)
-        except InvalidOption, msg:
-            print("[%s] is not present in backend [%s]." % (key, self._name))
+        except InvalidOption, e:
+            print("[%s] is not present in backend [%s]." % (e.option, e.section))
             raise InvalidOption(self._name, key)
         return item
 
@@ -69,28 +69,28 @@
             # Choose object type
             if basename(f) == 'Packages':
                 pkg = Package
-                list = bin
+                pkglist = bin
             elif basename(f) == 'Sources':
                 pkg = SourcePackage
-                list = source
+                pkglist = source
 
             # Load file on list
             parse = apt_pkg.ParseTagFile(open(f, "r"))
             print "Loading", f
             while parse.Step() == 1:
                 p = pkg(parse.Section)
-                list.add(p)
+                pkglist.add(p)
 
-        filter = []
+        pkgfilter = []
         try:
-            filter = self._cfg.getOption('filter', self._name)
-        except InvalidOption, e:
+            pkgfilter = self._cfg.getOption('filter', self._name)
+        except InvalidOption:
             pass
 
         # Apply filter or use as final list
-        if filter:
-            self.__bin = bin.filter(filter)
-            self.__source = source.filter(filter)
+        if pkgfilter:
+            self.__bin = bin.filter(pkgfilter)
+            self.__source = source.filter(pkgfilter)
         else:
             self.__bin = bin
             self.__source = source