diff options
| author |   Alexander Bersenev <bay@hackerdom.ru> | 2014-02-17 17:55:51 +0600 |
|---|---|---|
| committer | Alexander Bersenev <bay@hackerdom.ru> | 2014-02-17 17:55:51 +0600 |
| commit | 5a3f506c9ef1cfd78940b0509f10ef94b4434e29 (patch) | |
| tree | 147c35a17a8bcd8ff467bb3063adab623da51fac /portage_with_autodep/pym/_emerge/EbuildPhase.py | |
| parent | fixed a deadlock (diff) | |
| download | autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.tar.gz autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.tar.bz2 autodep-5a3f506c9ef1cfd78940b0509f10ef94b4434e29.zip | |
updated portage to 2.2.8-r1
Diffstat (limited to 'portage_with_autodep/pym/_emerge/EbuildPhase.py')
| -rw-r--r-- | portage_with_autodep/pym/_emerge/EbuildPhase.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/portage_with_autodep/pym/_emerge/EbuildPhase.py b/portage_with_autodep/pym/_emerge/EbuildPhase.py index 82c165d..36ca8b0 100644 --- a/portage_with_autodep/pym/_emerge/EbuildPhase.py +++ b/portage_with_autodep/pym/_emerge/EbuildPhase.py @@ -33,12 +33,14 @@ class EbuildPhase(CompositeTask): ("_ebuild_lock",) # FEATURES displayed prior to setup phase - _features_display = ("ccache", "depcheck", "depcheckstrict" "distcc", - "distcc-pump", "fakeroot", + _features_display = ( + "ccache", "compressdebug", "depcheck", "depcheckstrict", + "distcc", "distcc-pump", "fakeroot", "installsources", "keeptemp", "keepwork", "nostrip", "preserve-libs", "sandbox", "selinux", "sesandbox", "splitdebug", "suidctl", "test", "userpriv", - "usersandbox") + "usersandbox" + ) # Locked phases _locked_phases = ("setup", "preinst", "postinst", "prerm", "postrm") @@ -274,13 +276,15 @@ class EbuildPhase(CompositeTask): temp_file = open(_unicode_encode(temp_log, encoding=_encodings['fs'], errors='strict'), 'rb') - log_file = self._open_log(log_path) + log_file, log_file_real = self._open_log(log_path) for line in temp_file: log_file.write(line) temp_file.close() log_file.close() + if log_file_real is not log_file: + log_file_real.close() os.unlink(temp_log) def _open_log(self, log_path): @@ -288,11 +292,12 @@ class EbuildPhase(CompositeTask): f = open(_unicode_encode(log_path, encoding=_encodings['fs'], errors='strict'), mode='ab') + f_real = f if log_path.endswith('.gz'): f = gzip.GzipFile(filename='', mode='ab', fileobj=f) - return f + return (f, f_real) def _die_hooks(self): self.returncode = None |