From bfa90a64d565065d01d37438357f751c2998d252 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Fri, 27 May 2016 09:16:02 +0200 Subject: [PATCH] prscript: fix error handling Last result was used as global result. --- qa/prscript.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qa/prscript.py b/qa/prscript.py index 840d59526a..21e9894331 100755 --- a/qa/prscript.py +++ b/qa/prscript.py @@ -343,14 +343,14 @@ if len(buildids): else: sys.exit(0) -res = 0 +buildres = 0 if args.docker: while len(buildids): up_buildids = copy.copy(buildids) for build in buildids: ret = GetBuildStatus(build, buildids[build], builder_name = build) if ret == -1: - res = -1 + buildres = -1 up_buildids.pop(build, None) if len(up_buildids): remains = " (remaining builds: " + ', '.join(up_buildids.keys()) + ")" @@ -376,8 +376,10 @@ if args.docker: else: for build in buildids: 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: print "You can copy/paste following lines into github PR" for build in buildids: