[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-598-gace668e

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 7411ea7b09b289cd3d285e632d395f21d9e0335d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Mar 21 18:00:18 2012 +0100

    simplify deciding testability of circular deps
    
    no need to handle dependencies in error state when checking
    circular deps - already covered by error propagation
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index ebb452a..3839335 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -389,13 +389,12 @@ class PackagesDB:
             testable = True
             for dep in deps:
                 dep_state = self.get_package_state(dep)
-                if dep not in self._known_circular_depends and dep_state in \
-                        ["successfully-tested", "essential-required"]:
+                if dep in self._known_circular_depends:
+                    # allow any non-error dep_state on the cycle for testing
+                    # (error states are handled by the error propagation above)
                     pass
-                elif dep in self._known_circular_depends and dep_state not in \
-                        ["failed-testing", "dependency-failed-testing"]:
-                    pass
-                else:
+                elif dep_state not in ["successfully-tested", "essential-required"]:
+                    # non-circular deps must have passed before testing circular deps
                     testable = False
                     break
             if testable:

-- 
piuparts git repository