[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

Andreas Beckmann debian at abeckmann.de
Fri Dec 23 10:27:53 UTC 2011


The following commit has been merged in the master branch:
commit c01e23edeff0c610d182089e772be0bf4ca57a9c
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Dec 2 10:49:25 2011 +0100

    reindent
    
    reindent first to avoid cluttering the following patch
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 64459c9..c41f31f 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -384,7 +384,7 @@ class PackagesDB:
         state = "waiting-to-be-tested"
         for dep in package.dependencies():
             if self._package_state[dep] not in \
-               ["successfully-tested", "essential-required"]:
+                    ["successfully-tested", "essential-required"]:
                 state = "unknown"
                 break
         if state == "waiting-to-be-tested":
@@ -396,20 +396,20 @@ class PackagesDB:
             if pkg in deps:
                 deps.remove(pkg)
         if package["Package"] in deps:
-            return "circular-dependency" # actually, it's a unknown circular-dependency
+            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:
-          for dep in package.dependencies():
-            if dep not in self._known_circular_depends and self._package_state[dep] not in \
-               ["successfully-tested", "essential-required"]:
-                state = "unknown"
-                break
-            if dep in self._known_circular_depends and self._package_state[dep] not in \
-               ["failed-testing","dependency-failed-testing"]:
-                state = "waiting-to-be-tested"
-                continue
+            for dep in package.dependencies():
+                if dep not in self._known_circular_depends and self._package_state[dep] not in \
+                        ["successfully-tested", "essential-required"]:
+                    state = "unknown"
+                    break
+                if dep in self._known_circular_depends and self._package_state[dep] not in \
+                        ["failed-testing", "dependency-failed-testing"]:
+                    state = "waiting-to-be-tested"
+                    continue
         return state
 
     def _compute_package_states(self):

-- 
piuparts git repository



More information about the Piuparts-commits mailing list