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

    remove no-dependency-from-alternatives-exists state
    
    replace 'no-dependency-from-alternatives-exists' with
    'dependency-does-not-exist', no need to distinguish them
    inheriting failures will be 'dependency-cannot-be-tested'
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index 5b514b1..9da0e97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ piuparts (0.45) UNRELEASED; urgency=low
     - Simplify handling of package and dependency states.
     - Do not inherit 'dependency-does-not-exist' state (which may be fixed
       in the package) but propagate it to 'dependency-cannot-be-tested'.
+    - Remove 'no-dependency-from-alternatives-exists' state and use
+      'dependency-does-not-exist' instead.
 
   [ Leo Iannacone ]
   * piuparts.py: add --existing-chroot option, specify a directory as source
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index d4d6731..f5b048c 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -216,7 +216,7 @@ class PackagesDB:
         "circular-dependency",
         "unknown",
         "unknown-preferred-alternative",
-        "no-dependency-from-alternatives-exists",
+        "no-dependency-from-alternatives-exists",  # obsolete
         #"does-not-exist",  # can only happen as query result for a dependency
     ]
 
@@ -229,7 +229,6 @@ class PackagesDB:
         "dependency-cannot-be-tested": "dependency-cannot-be-tested",
         "dependency-does-not-exist": "dependency-cannot-be-tested",
         "unknown-preferred-alternative": "unknown-preferred-alternative",
-        "no-dependency-from-alternatives-exists": "dependency-cannot-be-tested",
         "does-not-exist": "dependency-does-not-exist",
     }
 
@@ -364,12 +363,12 @@ class PackagesDB:
                                 if alt_state is None:
                                     alt_state = altdep_state
 
+                    if alt_found == 0:
+                        return "dependency-does-not-exist"
                     if prefer_alt_score >= 2:
                         package.prefer_alt_depends(header, d, prefer_alt)
                     elif prefer_alt_score == 1 and ((alt_unknowns + alt_fails) == 0):
                         package.prefer_alt_depends(header, d, prefer_alt)
-                    elif alt_found == 0:
-                        return "no-dependency-from-alternatives-exists"
                     else:
                         if alt_state is not None and alt_unknowns == 0:
                             state = alt_state

-- 
piuparts git repository