diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-21 21:28:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-21 21:28:58 +0000 |
| commit | 826a95ce77c9ea2dccf74d7317c212be42d29cea (patch) | |
| tree | 0dc5828ca2204f18faea96492fe590b9d75a37f7 | |
| parent | 9504d6638cf0a8e8b88b7964847b44edf3866870 (diff) | |
| download | portage-826a95ce77c9ea2dccf74d7317c212be42d29cea.tar.gz portage-826a95ce77c9ea2dccf74d7317c212be42d29cea.tar.bz2 portage-826a95ce77c9ea2dccf74d7317c212be42d29cea.zip | |
In EbuildProcess._start(), don't open the log file during the clean phase
since the open file can result in an nfs lock on $T/build.log which prevents
the clean phase from removing $T. Thanks to Jeremy Olexa <darkside@g.o> for
reporting. (trunk r12016)
svn path=/main/branches/2.1.6/; revision=12017
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 689dffa2f..f261ebaf7 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2866,7 +2866,11 @@ class EbuildProcess(SpawnProcess): __slots__ = ("phase", "pkg", "settings", "tree") def _start(self): - self.logfile = self.settings.get("PORTAGE_LOG_FILE") + # Don't open the log file during the clean phase since the + # open file can result in an nfs lock on $T/build.log which + # prevents the clean phase from removing $T. + if self.phase not in ("clean", "cleanrm"): + self.logfile = self.settings.get("PORTAGE_LOG_FILE") SpawnProcess._start(self) def _pipe(self, fd_pipes): |