prscript: fix error handling

Last result was used as global result.
pull/2105/merge
Eric Leblond 9 years ago committed by Victor Julien
parent 5e7f617b7b
commit bfa90a64d5

@ -343,14 +343,14 @@ if len(buildids):
else: else:
sys.exit(0) sys.exit(0)
res = 0 buildres = 0
if args.docker: if args.docker:
while len(buildids): while len(buildids):
up_buildids = copy.copy(buildids) up_buildids = copy.copy(buildids)
for build in buildids: for build in buildids:
ret = GetBuildStatus(build, buildids[build], builder_name = build) ret = GetBuildStatus(build, buildids[build], builder_name = build)
if ret == -1: if ret == -1:
res = -1 buildres = -1
up_buildids.pop(build, None) up_buildids.pop(build, None)
if len(up_buildids): if len(up_buildids):
remains = " (remaining builds: " + ', '.join(up_buildids.keys()) + ")" remains = " (remaining builds: " + ', '.join(up_buildids.keys()) + ")"
@ -376,8 +376,10 @@ if args.docker:
else: else:
for build in buildids: for build in buildids:
res = WaitForBuildResult(build, buildids[build], builder_name = build) res = WaitForBuildResult(build, buildids[build], builder_name = build)
if res == -1:
buildres = -1
if res == 0: if buildres == 0:
if not args.norebase and not args.docker: if not args.norebase and not args.docker:
print "You can copy/paste following lines into github PR" print "You can copy/paste following lines into github PR"
for build in buildids: for build in buildids:

Loading…
Cancel
Save