Fix --rebuilt-binaries code to return existing_node where appropriate.
authorZac Medico <zmedico@gentoo.org>
Thu, 27 May 2010 11:04:50 +0000 (04:04 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 27 May 2010 11:04:50 +0000 (04:04 -0700)
pym/_emerge/depgraph.py

index a3eee8e25940b4f58d4ce28ebe4691551f62390d..11ff7d373232c39b5b6f1f53a8e36bdf92d7a1c6 100644 (file)
@@ -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: