From: Zac Medico Date: Thu, 27 May 2010 10:55:21 +0000 (-0700) Subject: Tweak --rebuilt-binaries code to solve bug #306659 once again (logic X-Git-Tag: v2.2_rc68~567 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c266504943ef8de196d9b270b20e2815c0300c33;p=portage.git Tweak --rebuilt-binaries code to solve bug #306659 once again (logic was reverted by the --rebuilt-binaries-timestamp patch). --- diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ae7b21133..a3eee8e25 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2783,7 +2783,8 @@ class depgraph(object): if "--rebuilt-binaries-timestamp" in self._frozen_config.myopts: minimal_timestamp = self._frozen_config.myopts["--rebuilt-binaries-timestamp"] - if built_timestamp > installed_timestamp and \ + if built_timestamp and \ + built_timestamp > installed_timestamp and \ built_timestamp >= minimal_timestamp: return built_pkg, built_pkg else: @@ -2791,7 +2792,8 @@ class depgraph(object): #package. This is for closely tracking a binhost. #Use --rebuilt-binaries-timestamp 0 if you want only newer binaries #pulled in here. - if built_timestamp != installed_timestamp: + if built_timestamp and \ + built_timestamp != installed_timestamp: return built_pkg, built_pkg if avoid_update: