From e93b5b529717810ce95e145bf31cacb2c059d601 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 3 May 2009 07:25:19 +0000 Subject: Simplify DepPriority.__int__() and make it consistent with __str__(). svn path=/main/trunk/; revision=13599 --- pym/_emerge/__init__.py | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index baa4ef267..7c5a82324 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -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: -- cgit v1.2.3-1-g7c22