diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-05-27 03:55:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-05-27 03:55:21 -0700 |
| commit | c266504943ef8de196d9b270b20e2815c0300c33 (patch) | |
| tree | d45c4d72e168d521197fed1941be5400c60d52c4 | |
| parent | 0c85dbb060efade7114a72db615199c88e8558d6 (diff) | |
| download | portage-c266504943ef8de196d9b270b20e2815c0300c33.tar.gz portage-c266504943ef8de196d9b270b20e2815c0300c33.tar.bz2 portage-c266504943ef8de196d9b270b20e2815c0300c33.zip | |
Tweak --rebuilt-binaries code to solve bug #306659 once again (logic
was reverted by the --rebuilt-binaries-timestamp patch).
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files changed, 4 insertions, 2 deletions
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: |