diff options
| author |   Sam James <sam@gentoo.org> | 2023-09-08 21:35:36 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-09-08 21:35:36 +0100 |
| commit | 5d60ca35e66e241c092c8f42b2edf65789e51f28 (patch) | |
| tree | 832bd26b8124afc44365f4e238aad43c89161750 | |
| parent | gpkg: drop dead code (< Python 3.9 conditional) for subprocess (diff) | |
| download | portage-5d60ca35.tar.gz portage-5d60ca35.tar.bz2 portage-5d60ca35.zip | |
gpkg: drop more dead code
_drop_privileges was only called by the <py3.9 compat bits in subprocess.Popen
w/ preexec_fn.
Fixes: 31cec19a1b976c59f8f958f86631bca0f99a5ec5
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | lib/portage/gpkg.py | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/lib/portage/gpkg.py b/lib/portage/gpkg.py index 4b94853e4..d16dffbc2 100644 --- a/lib/portage/gpkg.py +++ b/lib/portage/gpkg.py @@ -142,29 +142,6 @@ class tar_stream_writer: def __exit__(self, exc_type, exc_value, traceback): self.close() - def _drop_privileges(self): - if self.uid: - try: - os.setuid(self.uid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to user {self.uid} failed." - ) - ) - raise - - if self.gid: - try: - os.setgid(self.gid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to group {self.gid} failed." - ) - ) - raise - def kill(self): """ kill external program if any error happened in python @@ -363,29 +340,6 @@ class tar_stream_reader: writemsg(colorize("BAD", f"GPKG subprocess failed: {self.cmd} \n")) raise CompressorOperationFailed("PIPE broken") - def _drop_privileges(self): - if self.uid: - try: - os.setuid(self.uid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to user {self.uid} failed." - ) - ) - raise - - if self.gid: - try: - os.setgid(self.gid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to group {self.gid} failed." - ) - ) - raise - def kill(self): """ kill external program if any error happened in python @@ -593,29 +547,6 @@ class checksum_helper: writemsg(colorize("BAD", f"!!!\n{self.gpg_result.decode()}")) raise InvalidSignature("GPG verify failed") - def _drop_privileges(self): - if self.uid: - try: - os.setuid(self.uid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to user {self.uid} failed." - ) - ) - raise - - if self.gid: - try: - os.setgid(self.gid) - except PermissionError: - writemsg( - colorize( - "BAD", f"!!! Drop root privileges to group {self.gid} failed." - ) - ) - raise - def update(self, data): """ Write data to hash libs and GPG stdin. |