From bf00b054aa8ebc5cdbb83d5fec28280edfa9965c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 2 Dec 2007 09:10:56 +0000 Subject: 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 --- pym/_emerge/__init__.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pym/_emerge') 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 ("+ \ -- cgit v1.2.3-1-g7c22