From 225499a8a36604412c2de35c078861fb6547333f Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Dec 2007 09:13:48 +0000
Subject: Synchronize self-reinstallation logic so that emerge will always
 restart itself when dblink.merge() creates temporary copies of
 PORTAGE_{BIN,PYM}_PATH. (trunk r8803)

svn path=/main/branches/2.1.2/; revision=8804
---
 bin/emerge | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index 1ea9b8a00..096d08610 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4064,11 +4064,7 @@ class MergeTask(object):
 					# Figure out if we need a restart.
 					mysplit=portage.pkgsplit(x[2])
 					if mysplit[0] == "sys-apps/portage" and x[1] == "/":
-						myver=mysplit[1]+"-"+mysplit[2]
-						if myver[-3:]=='-r0':
-							myver=myver[:-3]
-						if (myver != portage.VERSION) and \
-						   "livecvsportage" not in self.settings.features:
+						if "livecvsportage" not in self.settings.features:
 							if len(mymergelist) > mergecount:
 								emergelog(xterm_titles,
 									" ::: completed emerge ("+ \
-- 
cgit v1.2.3-1-g7c22