r320 - in branches/rewrite: . src

[Otavio Salvador]

Author: otavio
Date: Tue Nov 16 13:16:02 2004
New Revision: 320

Modified:
   branches/rewrite/   (props changed)
   branches/rewrite/src/Backend.py
   branches/rewrite/src/Dists.py
   branches/rewrite/src/PackageList.py
   branches/rewrite/src/debpartial-mirror.in
Log:
 r279@nurf:  otavio | 2004-11-16T19:59:51.074555Z
 Remove debug print.


Modified: branches/rewrite/src/Backend.py
==============================================================================
--- branches/rewrite/src/Backend.py	(original)
+++ branches/rewrite/src/Backend.py	Tue Nov 16 13:16:02 2004
@@ -55,7 +55,7 @@
             item = self._cfg.getOption(key, self._name)
         except InvalidOption, msg:
             print("[%s] is not present in backend [%s]." % (key, self._name))
-            exit(1)
+            raise InvalidOption(self._name, key)
         return item
 
     def update (self):
@@ -76,6 +76,15 @@
             while parse.Step() == 1:
                 p = pkg(parse.Section)
                 list.add(p)
+
+        try:
+            filter = self._cfg.getOption('filter', self._name)
+            self.__bin = self.__bin.filter(filter)
+            self.__source = self.__source.filter(filter)
+        except InvalidOption, e:
+            pass #sometimes we doesn't have a filter
+
+        print len(self.__bin), len(self.__source)
             
     def remove (self):
         """ Remove backend """

Modified: branches/rewrite/src/Dists.py
==============================================================================
--- branches/rewrite/src/Dists.py	(original)
+++ branches/rewrite/src/Dists.py	Tue Nov 16 13:16:02 2004
@@ -94,8 +94,6 @@
 
         for d in Download().fetchers:
             d.join()
-
-        print "ACABOU!"
             
 class LocalDists (Dists):
     """

Modified: branches/rewrite/src/PackageList.py
==============================================================================
--- branches/rewrite/src/PackageList.py	(original)
+++ branches/rewrite/src/PackageList.py	Tue Nov 16 13:16:02 2004
@@ -78,7 +78,7 @@
             raise PackageDoesNotExist, key
         return self._name[key]
         
-    def add(self, package):
+    def add(self, package, pkglist=None):
         if self._name.has_key(package['Package']):
             raise PackageAlreadyExists, package['Package']
 
@@ -91,6 +91,8 @@
         self._subsection[package['Section']].append(package)
         self._priority[package['Priority']].append(package)
 
+        #print package['Package'],'Depende', package['Depends']
+
     def remove(self, package):
         if isinstance(package, str):
             if not self._name.has_key(package):

Modified: branches/rewrite/src/debpartial-mirror.in
==============================================================================
--- branches/rewrite/src/debpartial-mirror.in	(original)
+++ branches/rewrite/src/debpartial-mirror.in	Tue Nov 16 13:16:02 2004
@@ -54,6 +54,5 @@
 for b in cnf.getBackends():
     backends.append(Backend(b.section, cnf))
 for b in backends:
-    #b.update()
-    b.upgrade()
-    
+    b.update()
+    #b.upgrade()