summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-10-17 23:37:20 -0700
committerZac Medico <zmedico@gentoo.org>2012-10-17 23:37:20 -0700
commitc34b00b7b402b199cc6b7db1a7d1d4547ef3b413 (patch)
treec24ab2f447b31af85a2bb3ca59d1115705104cfd
parent25bf5ebc00fa1c79e6f764a58802cd70a16967bf (diff)
downloadportage-2.2.0_alpha141.tar.gz
portage-2.2.0_alpha141.tar.bz2
portage-2.2.0_alpha141.zip
ManifestTask: use null stdin when checking sigv2.2.0_alpha141
-rw-r--r--pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py b/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py
index d923088f5..e2d023a8c 100644
--- a/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py
+++ b/pym/portage/package/ebuild/_parallel_manifest/ManifestTask.py
@@ -60,10 +60,12 @@ class ManifestTask(CompositeTask):
self._start_gpg_proc()
def _check_sig_key(self):
+ null_fd = os.open('/dev/null', os.O_RDONLY)
popen_proc = PopenProcess(proc=subprocess.Popen(
["gpg", "--verify", self._manifest_path],
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT),
+ stdin=null_fd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT),
pipe_reader=PipeReader())
+ os.close(null_fd)
popen_proc.pipe_reader.input_files = {
"producer" : popen_proc.proc.stdout}
self._start_task(popen_proc, self._check_sig_key_exit)