diff options
author | Sam James <sam@gentoo.org> | 2023-09-08 20:49:21 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-09-08 20:49:21 +0100 |
commit | 31cec19a1b976c59f8f958f86631bca0f99a5ec5 (patch) | |
tree | 033578ad5eb8028e00ce834a158251c98d4a19ad | |
parent | Run PORTAGE_TRUST_HELPER before remote binary package operations (diff) | |
download | portage-31cec19a1b976c59f8f958f86631bca0f99a5ec5.tar.gz portage-31cec19a1b976c59f8f958f86631bca0f99a5ec5.tar.bz2 portage-31cec19a1b976c59f8f958f86631bca0f99a5ec5.zip |
gpkg: drop dead code (< Python 3.9 conditional) for subprocess
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | lib/portage/gpkg.py | 73 |
1 files changed, 23 insertions, 50 deletions
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py index 6ed2a6d00..4b94853e4 100644 --- a/lib/portage/gpkg.py +++ b/lib/portage/gpkg.py @@ -120,21 +120,13 @@ class tar_stream_writer: if cmd is None: self.proc = None else: - if sys.hexversion >= 0x03090000: - self.proc = subprocess.Popen( - cmd, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - user=self.uid, - group=self.gid, - ) - else: - self.proc = subprocess.Popen( - cmd, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - preexec_fn=self._drop_privileges, - ) + self.proc = subprocess.Popen( + cmd, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + user=self.uid, + group=self.gid, + ) self.read_thread = threading.Thread( target=self._cmd_read_thread, name="tar_stream_cmd_read", daemon=True @@ -318,21 +310,13 @@ class tar_stream_reader: self.proc = None else: # Start external decompressor - if sys.hexversion >= 0x03090000: - self.proc = subprocess.Popen( - cmd, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - user=self.uid, - group=self.gid, - ) - else: - self.proc = subprocess.Popen( - cmd, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - preexec_fn=self._drop_privileges, - ) + self.proc = subprocess.Popen( + cmd, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + user=self.uid, + group=self.gid, + ) self.read_io = self.proc.stdout # Start stdin block writing thread self.thread = threading.Thread( @@ -575,26 +559,15 @@ class checksum_helper: ) gpg_verify_command = [x for x in gpg_verify_command if x != ""] - if sys.hexversion >= 0x03090000: - self.gpg_proc = subprocess.Popen( - gpg_verify_command, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - env=env, - user=self.uid, - group=self.gid, - ) - - else: - self.gpg_proc = subprocess.Popen( - gpg_verify_command, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - env=env, - preexec_fn=self._drop_privileges, - ) + self.gpg_proc = subprocess.Popen( + gpg_verify_command, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + env=env, + user=self.uid, + group=self.gid, + ) def __del__(self): self.finish() |