Simplify DepPriority.__int__() and make it consistent with __str__().
authorZac Medico <zmedico@gentoo.org>
Sun, 3 May 2009 07:25:19 +0000 (07:25 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 3 May 2009 07:25:19 +0000 (07:25 -0000)
svn path=/main/trunk/; revision=13599

pym/_emerge/__init__.py

index baa4ef2679973d3f0a9094cfd82104b9b57a86e4..7c5a82324d9945c05709aea547ef2980307f9ad5 100644 (file)
@@ -945,35 +945,23 @@ class DepPriority(AbstractDepPriority):
 
                Attributes                            Hardness
 
-               not satisfied and buildtime            8
-               not satisfied and runtime              7
-               not satisfied and runtime_post         6
-               satisfied and buildtime and rebuild    5
-               satisfied and buildtime                4
-               satisfied and runtime                  3
-               satisfied and runtime_post             2
-               optional                               1
-               (none of the above)                    0
-
-               """
-               if not self.satisfied:
-                       if self.buildtime:
-                               return 8
-                       if self.runtime:
-                               return 7
-                       if self.runtime_post:
-                               return 6
+               buildtime                               0
+               runtime                                -1
+               runtime_post                           -2
+               optional                               -3
+               (none of the above)                    -4
+
+               """
+
                if self.buildtime:
-                       if self.rebuild:
-                               return 5
-                       return 4
+                       return 0
                if self.runtime:
-                       return 3
+                       return -1
                if self.runtime_post:
-                       return 2
+                       return -2
                if self.optional:
-                       return 1
-               return 0
+                       return -3
+               return -4
 
        def __str__(self):
                if self.optional: