Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

onlbuilder: Support Python3 #908

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

onlbuilder: Support Python3 #908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docker/tools/onlbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/env python

import os
import sys
Expand Down Expand Up @@ -126,10 +126,10 @@ logger.debug('arguments: %s\n' % vars(ops))

if ops.pull:
try:
print "Pulling %s..." % ops.image
print("Pulling %s..." % ops.image)
x = subprocess.check_output(('docker', 'pull', ops.image), stderr=subprocess.STDOUT)
print "done."
except subprocess.CalledProcessError, e:
print("done.")
except subprocess.CalledProcessError as e:
sys.stderr.write("** Failed to pull the docker image %s (%d):\n\n%s\n" % (ops.image, e.returncode, e.output))
sys.exit(1)

Expand Down Expand Up @@ -174,7 +174,7 @@ else:
g_docker_arguments = "docker run --privileged %(interactive)s -t -e DOCKER_IMAGE=%(image)s --name %(name)s %(ssh_options)s %(volume_options)s " % g_arg_d

if ops.isolate is not None:
if len(ops.isolate) is 0:
if len(ops.isolate) == 0:
ops.isolate.append(os.getcwd())

isolates = [ os.path.abspath(i) for i in ops.isolate ]
Expand Down