add AttributeError again

This commit is contained in:
Fabrice Flore-Thébault 2020-06-03 18:04:13 +02:00
parent a8887d2cfe
commit 4416c3d512

View file

@ -78,15 +78,21 @@ def install_environment(
def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover def get_docker_user() -> Tuple[str, ...]: # pragma: win32 no cover
output = subprocess.check_output(('docker', 'system', 'info'), text=True) try:
for line in output.splitlines(): output = subprocess.check_output(
# rootless docker has "rootless" ('docker', 'system', 'info'),
# rootless podman has "rootless: true" text=True,
if line.strip().startswith('rootless'): )
if not 'false' in line: for line in output.splitlines():
return () # no -u for rootless # rootless docker has "rootless"
break # rootless podman has "rootless: true"
return ('-u', f'{os.getuid()}:{os.getgid()}') 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 def docker_cmd() -> Tuple[str, ...]: # pragma: win32 no cover