From ece90688857aa3e992668529804fe93fc941a824 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 3 May 2009 20:28:40 +0000 Subject: [PATCH] Simplify DepPriority.__int__() and make it consistent with __str__(). (trunk r13599) svn path=/main/branches/2.1.6/; revision=13605 --- pym/_emerge/__init__.py | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4a371b365..dc2d556c2 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -926,35 +926,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: -- 2.26.2