diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-15 12:36:02 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-15 12:36:02 -0800 |
| commit | e9dc2b6753aa29eb776f15532fdda18f10af5d44 (patch) | |
| tree | 1ed8160ae8ec7ac1dee4c7c78409afb4e88490f8 /pym/_emerge | |
| parent | dbe26095102cbdc6d5bef3509f05bc7b42c418cc (diff) | |
| download | portage-e9dc2b6753aa29eb776f15532fdda18f10af5d44.tar.gz portage-e9dc2b6753aa29eb776f15532fdda18f10af5d44.tar.bz2 portage-e9dc2b6753aa29eb776f15532fdda18f10af5d44.zip | |
EbuildMetadataPhase: use dynamic pipe fd
Also, remove deprecated code from doebuild (with hardcoded pipe fd).
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 4806f5c2d..4c7d772d4 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -32,7 +32,6 @@ class EbuildMetadataPhase(SubProcess): _file_names = ("ebuild",) _files_dict = slot_dict_class(_file_names, prefix="") - _metadata_fd = 9 def _start(self): ebuild_path = self.ebuild_hash.location @@ -103,7 +102,8 @@ class EbuildMetadataPhase(SubProcess): fcntl.fcntl(master_fd, fcntl.F_SETFL, fcntl.fcntl(master_fd, fcntl.F_GETFL) | fcntl_flags) - fd_pipes[self._metadata_fd] = slave_fd + fd_pipes[slave_fd] = slave_fd + settings["PORTAGE_PIPE_FD"] = str(slave_fd) self._raw_metadata = [] files.ebuild = master_fd @@ -115,6 +115,7 @@ class EbuildMetadataPhase(SubProcess): settings=settings, debug=debug, mydbapi=self.portdb, tree="porttree", fd_pipes=fd_pipes, returnpid=True) + settings.pop("PORTAGE_PIPE_FD", None) os.close(slave_fd) null_input.close() |