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

    defer propagation of failures while resolving alternatives
    
    do not inherit failures when resolving alternate dependencies,
    this will be done later anyway
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index 9afb962..94a015e 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -335,15 +335,11 @@ class PackagesDB:
         #      instead of "waiting-to-be-tested" depending on the order the
         #      package states get resolved.
 
-        state = None
         for header in ["Depends", "Pre-Depends"]:
             alt_deps = package.all_dependencies(header)
             for d in range(len(alt_deps)):
                 if len(alt_deps[d]) > 1:
                     alt_found = 0
-                    alt_fails = 0
-                    alt_unknowns = 0
-                    alt_state = None
                     prefer_alt_score = -1
                     prefer_alt = None
                     for alternative in alt_deps[d]:
@@ -363,24 +359,10 @@ class PackagesDB:
                             elif prefer_alt_score < 0 and altdep_state == "unknown":
                                 prefer_alt = alternative
                                 prefer_alt_score = 0
-                                alt_unknowns += 1
-                            elif altdep_state == "unknown":
-                                alt_unknowns += 1
-                            else:
-                                alt_fails += 1
-                                if alt_state is None:
-                                    alt_state = altdep_state
-
                     if alt_found == 0:
                         return "dependency-does-not-exist"
                     if prefer_alt_score >= 0:
                         package.prefer_alt_depends(header, d, prefer_alt)
-                    else:
-                        if alt_state is not None and alt_unknowns == 0:
-                            state = alt_state
-
-        if state is not None:
-             return state
 
         for dep in package.dependencies():
             dep_state = self.get_package_state(dep)

-- 
piuparts git repository