[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.42-30-gaa772de

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit be5ef7a3fa2c56c482b28a433b7ce8009c197d10
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Thu Jan 12 18:48:31 2012 +0100

    restore the original order of the states
    
    I'm afraid reordering them will break counts.txt.  No harm has
    been done so far because PackagesDB._states was not modified.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-report.py b/piuparts-report.py
index 8925fc5..c0ec65e 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -447,10 +447,10 @@ def emphasize_reason(reason):
         "dependency-cannot-be-tested",
         "dependency-does-not-exist",
         "circular-dependency",
-        "does-not-exist",
         "unknown",
         "unknown-preferred-alternative",
         "no-dependency-from-alternatives-exists",
+        "does-not-exist",
     ]
     if reason in bad_states:
       reason = "<em>"+reason+"</em>"
diff --git a/piupartslib/packagesdb.py b/piupartslib/packagesdb.py
index c134e6a..c704005 100644
--- a/piupartslib/packagesdb.py
+++ b/piupartslib/packagesdb.py
@@ -215,6 +215,7 @@ class LogDB:
 class PackagesDB:
 
     # keep in sync with piuparts-report.py: emphasize_reason()
+    # FIXME: can we reorder this list or remove entries without breaking the counts.txt for the plot?
     _states = [
         "successfully-tested",
         "failed-testing",
@@ -226,10 +227,10 @@ class PackagesDB:
         "dependency-cannot-be-tested",
         "dependency-does-not-exist",
         "circular-dependency",
-        #"does-not-exist",  # can only happen as query result for a dependency
         "unknown",
         "unknown-preferred-alternative",
         "no-dependency-from-alternatives-exists",
+        #"does-not-exist",  # can only happen as query result for a dependency
     ]
 
     _dep_state_to_state = {
@@ -240,9 +241,9 @@ class PackagesDB:
         "dependency-failed-testing": "dependency-failed-testing",
         "dependency-cannot-be-tested": "dependency-cannot-be-tested",
         "dependency-does-not-exist": "dependency-does-not-exist",
-        "does-not-exist": "dependency-does-not-exist",
         "unknown-preferred-alternative": "unknown-preferred-alternative",
         "no-dependency-from-alternatives-exists": "dependency-cannot-be-tested",
+        "does-not-exist": "dependency-does-not-exist",
     }
 
     def __init__(self, logdb=None, prefix=None):

-- 
piuparts git repository