diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-02 09:13:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-02 09:13:48 +0000 |
| commit | 225499a8a36604412c2de35c078861fb6547333f (patch) | |
| tree | bdd7103d7e1e1c9a6f608bc5f3ecaedccd8037bb | |
| parent | ff1009f5912a776cf6461e7d5b48d49e1b3595b5 (diff) | |
| download | portage-225499a8a36604412c2de35c078861fb6547333f.tar.gz portage-225499a8a36604412c2de35c078861fb6547333f.tar.bz2 portage-225499a8a36604412c2de35c078861fb6547333f.zip | |
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
| -rwxr-xr-x | bin/emerge | 6 | ||||
| -rw-r--r-- | pym/portage.py | 3 |
2 files changed, 3 insertions, 6 deletions
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 ("+ \ diff --git a/pym/portage.py b/pym/portage.py index f46276968..7bb53cc56 100644 --- 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 |