From 4416c3d51220846e9de9624735f6943744388bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20Flore-Th=C3=A9bault?= Date: Wed, 3 Jun 2020 18:04:13 +0200 Subject: [PATCH] add AttributeError again --- pre_commit/languages/docker.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py index e3970f49..244c2341 100644 --- a/pre_commit/languages/docker.py +++ b/pre_commit/languages/docker.py @@ -78,15 +78,21 @@ def install_environment( def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover - output = subprocess.check_output(('docker', 'system', 'info'), text=True) - for line in output.splitlines(): - # rootless docker has "rootless" - # rootless podman has "rootless: true" - if line.strip().startswith('rootless'): - if not 'false' in line: - return () # no -u for rootless - break - return ('-u', f'{os.getuid()}:{os.getgid()}') + try: + output = subprocess.check_output( + ('docker', 'system', 'info'), + text=True, + ) + for line in output.splitlines(): + # rootless docker has "rootless" + # rootless podman has "rootless: true" + if line.strip().startswith('rootless'): + if 'false' not in line: + return () # no -u for rootless + break + return ('-u', f'{os.getuid()}:{os.getgid()}') + except AttributeError: + return () def docker_cmd() -> Tuple[str, ...]: # pragma: win32 no cover