[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-583-ge144d01

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit eefb6d8c762a8b0c9223c371df4e385995091e4d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Mar 10 12:15:55 2012 +0100

    drop circular-dependency state
    
    we will compute and break the cycles ourselves so that we don't need to
    maintain known_circular_depends manually any longer
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 68fc7d4..2eb63d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ piuparts (0.45) UNRELEASED; urgency=low
       circular dependencies involving alternatives and virtual packages.
     - Fix state resolution of package dependencies containing alternatives,
       virtual packages and circular dependencies.
+    - Remove 'circular-dependency' state.
 
   [ Leo Iannacone ]
   * piuparts.py: add --existing-chroot option, specify a directory as source
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 94a015e..2dd9d38 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -213,7 +213,7 @@ class PackagesDB:
         "dependency-failed-testing",
         "dependency-cannot-be-tested",
         "dependency-does-not-exist",
-        "circular-dependency",
+        "circular-dependency",  # obsolete
         "unknown",
         "unknown-preferred-alternative",  # obsolete
         "no-dependency-from-alternatives-exists",  # obsolete
@@ -379,14 +379,6 @@ class PackagesDB:
         if state == "waiting-to-be-tested":
             return state
 
-        deps = self._get_recursive_dependencies(package, break_circles=False)
-        # ignore those packages:
-        for pkg in self._known_circular_depends:
-            if pkg in deps:
-                deps.remove(pkg)
-        if package["Package"] in deps:
-            return "circular-dependency"  # actually, it's an unknown circular-dependency
-
         # treat circular-dependencies as testable (for the part of the circle)
         state = "unknown" 
         if package["Package"] in self._known_circular_depends:

-- 
piuparts git repository