Skip to content

Commit

Permalink
PGAPX-403, return code fix, merge from master
Browse files Browse the repository at this point in the history
  • Loading branch information
Douglas Slotta committed May 13, 2019
1 parent 4554143 commit da32519
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions scripts/pgap.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def create_inputfile(self, local_input):
f.write(u'supplemental_data: { class: Directory, location: /pgap/input }\n')
if (self.params.report_usage != 'none'):
f.write(u'report_usage: {}\n'.format(self.params.report_usage))
if (self.params.ignore_all_errors != 'none'):
if (self.params.ignore_all_errors == 'true'):
f.write(u'ignore_all_errors: {}\n'.format(self.params.ignore_all_errors))
f.flush()
return yaml
Expand Down Expand Up @@ -239,6 +239,7 @@ def output_reader(proc, outq):
except subprocess.TimeoutExpired:
print('docker did not exit cleanly.')
t.join()
return proc.returncode

class Setup:

Expand Down Expand Up @@ -360,7 +361,6 @@ def get_ignore_all_errors(self):
return 'true'
else:
return 'false'
return 'none' # do we need this in Python? obviously code never reaches this

def get_timeout(self):
def str2sec(s):
Expand Down Expand Up @@ -460,9 +460,12 @@ def main():

params = Setup(args)

retcode = 0
if args.input:
p = Pipeline(params, args.input)
p.launch()
retcode = p.launch()

sys.exit(retcode)

if __name__== "__main__":
main()

0 comments on commit da32519

Please sign in to comment.