summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-12-02 09:10:56 +0000
committerZac Medico <zmedico@gentoo.org>2007-12-02 09:10:56 +0000
commitbf00b054aa8ebc5cdbb83d5fec28280edfa9965c (patch)
tree5a8624d98728ac0a8e1c89e394f2e3a8a86ea28e
parentee8f242c098b51363941f047f2c22f4ae1ea6aae (diff)
downloadportage-bf00b054aa8ebc5cdbb83d5fec28280edfa9965c.tar.gz
portage-bf00b054aa8ebc5cdbb83d5fec28280edfa9965c.tar.bz2
portage-bf00b054aa8ebc5cdbb83d5fec28280edfa9965c.zip
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
-rw-r--r--pym/_emerge/__init__.py6
-rw-r--r--pym/portage/dbapi/vartree.py3
2 files changed, 3 insertions, 6 deletions
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