[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 f6865452c45fc2836ef812cef59b7f8fd1b9c7b2
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Mar 10 11:34:29 2012 +0100

    fix waiting-to-be-tested for known circular deps
    
    fix logic error (a package can have multiple deps that are circular deps,
    in that case none of them may have failed or we can't test the package)
    cleanup/simplify, don't abuse strings as booleans
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 05cdbb7..4817f6c 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -380,19 +380,23 @@ class PackagesDB:
             return "waiting-to-be-tested"
 
         # treat circular-dependencies as testable (for the part of the circle)
-        state = "unknown" 
         if package["Package"] in self._known_circular_depends:
+            testable = True
             for dep in package.dependencies():
                 dep_state = self.get_package_state(dep)
-                if dep not in self._known_circular_depends and dep_state not in \
+                if dep not in self._known_circular_depends and dep_state in \
                         ["successfully-tested", "essential-required"]:
-                    state = "unknown"
-                    break
-                if dep in self._known_circular_depends and dep_state not in \
+                    pass
+                elif dep in self._known_circular_depends and dep_state not in \
                         ["failed-testing", "dependency-failed-testing"]:
-                    state = "waiting-to-be-tested"
-                    continue
-        return state
+                    pass
+                else:
+                    testable = False
+                    break
+            if testable:
+                return "waiting-to-be-tested"
+
+        return "unknown"
 
     def _compute_package_states(self):
         if self._in_state is not None:

-- 
piuparts git repository