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

diff --git a/bin/emerge b/bin/emerge
index 1ea9b8a00548e234389c90bd3488514c4b028108..096d08610b0ed124e317ca0104e485e8d05f9e18 100755 (executable)
--- 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 ("+ \

diff --git a/pym/portage.py b/pym/portage.py
index f46276968e23afbdb25c4263428c0620d8892d73..7bb53cc5619fac592171258885be162f4d15e7c9 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -9214,7 +9214,8 @@ class dblink:
                """
                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