Skip to content

Commit 33a61ca

Browse files
committed
not using user provided recipe
Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
1 parent 68bc89d commit 33a61ca

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

singularity/build/main.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ def run_build(build_dir, params, verbose=True):
8585

8686
if params['commit'] not in [None, '']:
8787
bot.info('Checking out commit %s' %params['commit'])
88-
os.system('git checkout %s .' %(params['commit']))
88+
os.system('git checkout %s .' % params['commit'])
8989

9090
# From here on out commit is used as a unique id, if we don't have one, we use current
9191
else:
9292
params['commit'] = os.popen('git log -n 1 --pretty=format:"%H"').read()
93-
bot.warning("commit not specified, setting to current %s" %params['commit'])
93+
bot.warning("commit not specified, setting to current %s" % params['commit'])
9494

9595
# Dump some params for the builder, in case it fails after this
9696
passing_params = "/tmp/params.pkl"
@@ -102,7 +102,7 @@ def run_build(build_dir, params, verbose=True):
102102

103103
# If the user has a symbolic link
104104
if os.path.islink(params['spec_file']):
105-
bot.info("%s is a symbolic link." %params['spec_file'])
105+
bot.info("%s is a symbolic link." % params['spec_file'])
106106
params['spec_file'] = os.path.realpath(params['spec_file'])
107107

108108
# Secure Build
@@ -115,7 +115,7 @@ def run_build(build_dir, params, verbose=True):
115115

116116
try:
117117
# Stream output
118-
for line in stream_command(["/bin/bash", template, "Singularity", "container.sif"]):
118+
for line in stream_command(["/bin/bash", template, params['spec_file'], "container.sif"]):
119119
print(line)
120120
except:
121121
bot.exit("Build error. See above for details")
@@ -260,7 +260,7 @@ def send_build_close(params,response_url):
260260

261261
headers = {'Authorization': signature }
262262

263-
finish = requests.post(response_url,data=response, headers=headers)
263+
finish = requests.post(response_url, data=response, headers=headers)
264264
bot.debug("FINISH POST TO SINGULARITY HUB ---------------------")
265265
bot.debug(finish.status_code)
266266
bot.debug(finish.reason)

0 commit comments

Comments
 (0)