diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-05-27 04:04:50 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-05-27 04:04:50 -0700 |
| commit | e317cd6d1b76c31d50f2ed08571109e93595ccf5 (patch) | |
| tree | a9e721cbf9c5e5e544a5bdabc0f18ce831754b12 | |
| parent | Tweak --rebuilt-binaries code to solve bug #306659 once again (logic (diff) | |
| download | portage-idfetch-e317cd6d1b76c31d50f2ed08571109e93595ccf5.tar.gz portage-idfetch-e317cd6d1b76c31d50f2ed08571109e93595ccf5.tar.bz2 portage-idfetch-e317cd6d1b76c31d50f2ed08571109e93595ccf5.zip | |
Fix --rebuilt-binaries code to return existing_node where appropriate.
| -rw-r--r-- | pym/_emerge/depgraph.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index a3eee8e2..11ff7d37 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2786,7 +2786,7 @@ class depgraph(object): if built_timestamp and \ built_timestamp > installed_timestamp and \ built_timestamp >= minimal_timestamp: - return built_pkg, built_pkg + return built_pkg, existing_node else: #Don't care if the binary has an older BUILD_TIME than the installed #package. This is for closely tracking a binhost. @@ -2794,7 +2794,7 @@ class depgraph(object): #pulled in here. if built_timestamp and \ built_timestamp != installed_timestamp: - return built_pkg, built_pkg + return built_pkg, existing_node if avoid_update: for pkg in matched_packages: |