From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 May 2010 11:04:50 +0000 (-0700)
Subject: Fix --rebuilt-binaries code to return existing_node where appropriate.
X-Git-Tag: v2.2_rc68~566
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e317cd6d1b76c31d50f2ed08571109e93595ccf5;p=portage.git

Fix --rebuilt-binaries code to return existing_node where appropriate.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a3eee8e25..11ff7d373 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: