Skip to content

Commit 624091b

Browse files
committed
Fix docker args conditional
1 parent d0852f3 commit 624091b

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

contrib/gitian-build.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ def setup():
1313
programs = ['ruby', 'git', 'make', 'wget', 'curl']
1414
if args.kvm:
1515
programs += ['apt-cacher-ng', 'python-vm-builder', 'qemu-kvm', 'qemu-utils']
16-
elif args.docker and not os.path.isfile('/lib/systemd/system/docker.service'):
17-
dockers = ['docker.io', 'docker-ce']
18-
for i in dockers:
19-
return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i])
20-
if return_code == 0:
21-
break
22-
if return_code != 0:
23-
print('Cannot find any way to install Docker.', file=sys.stderr)
24-
sys.exit(1)
16+
elif args.docker:
17+
if not os.path.isfile('/lib/systemd/system/docker.service'):
18+
dockers = ['docker.io', 'docker-ce']
19+
for i in dockers:
20+
return_code = subprocess.call(['sudo', 'apt-get', 'install', '-qq', i])
21+
if return_code == 0:
22+
break
23+
if return_code != 0:
24+
print('Cannot find any way to install Docker.', file=sys.stderr)
25+
sys.exit(1)
2526
else:
2627
programs += ['apt-cacher-ng', 'lxc', 'debootstrap']
2728
subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)

0 commit comments

Comments
 (0)