From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Dec 2007 09:10:56 +0000 (-0000)
Subject: Synchronize self-reinstallation logic so that emerge will always
X-Git-Tag: v2.2_pre1~246
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bf00b054aa8ebc5cdbb83d5fec28280edfa9965c;p=portage.git

Synchronize self-reinstallation logic so that emerge will always
restart itself when dblink.merge() creates temporary copies of
PORTAGE_{BIN,PYM}_PATH.

svn path=/main/trunk/; revision=8803
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0d35875f3..559a0c685 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4482,11 +4482,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 ("+ \
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 874a0e501..cc34a133a 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2365,7 +2365,8 @@ class dblink(object):
 		"""
 		if self.myroot == "/" and \
 			"sys-apps" == self.cat and \
-			"portage" == pkgsplit(self.pkg)[0]:
+			"portage" == pkgsplit(self.pkg)[0] and \
+			"livecvsportage" not in self.settings.features:
 			settings = self.settings
 			base_path_orig = os.path.dirname(settings["PORTAGE_BIN_PATH"])
 			from tempfile import mkdtemp