[Piuparts-commits] rev 768 - in trunk: . piupartslib

[Holger Levsen]

Author: holger
Date: 2010-11-13 22:31:11 +0000 (Sat, 13 Nov 2010)
New Revision: 768

Modified:
   trunk/piuparts-master.py
   trunk/piupartslib/packagesdb.py
Log:
try harder

Modified: trunk/piuparts-master.py
===================================================================
--- trunk/piuparts-master.py	2010-11-13 21:18:53 UTC (rev 767)
+++ trunk/piuparts-master.py	2010-11-13 22:31:11 UTC (rev 768)
@@ -129,7 +129,6 @@
         for kcd in known_circular_depends.split():
           my_known_circular_depends.append(kcd)
           logging.debug("circular depends: " + kcd)
-
         self._binary_db.set_known_circular_depends(my_known_circular_depends)
         self._writeline("hello")
 
@@ -201,8 +200,9 @@
     
         logging.info("Fetching %s" % config["packages-url"])
         packages_file = piupartslib.open_packages_url(config["packages-url"])
+        known_circular_depends = config["known_circular_depends"]
 
-        m = Master(sys.stdin, sys.stdout, packages_file, config["known_circular_depends"], section=section)
+        m = Master(sys.stdin, sys.stdout, packages_file, known_circular_depends, section=section)
         packages_file.close()
         while m.do_transaction():
             pass

Modified: trunk/piupartslib/packagesdb.py
===================================================================
--- trunk/piupartslib/packagesdb.py	2010-11-13 21:18:53 UTC (rev 767)
+++ trunk/piupartslib/packagesdb.py	2010-11-13 22:31:11 UTC (rev 768)
@@ -261,7 +261,6 @@
             format = self.prefix + "/%s"
         else:
             format = "%s"
-
         if ok:
             self._ok = format % ok
         if fail:
@@ -284,8 +283,7 @@
         self._packages = None
 
     def set_known_circular_depends(self, known_circular_depends=[]):
-        self._known_circular_depends = []
-        self._known_circular_depends = known_circular_depends
+        self._known_circular_depends.list(known_circular_depends)
 
     def _find_all_packages(self):
         if self._packages is None: