summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-07-06 13:15:03 -0400
committerColin Walters <walters@verbum.org>2010-07-06 13:15:03 -0400
commit89584987b3b0cc14566df8c0b3fd62713732ebca (patch)
treed71bca7fa51fbf22b7b14f8eef649c6d86b40031
parente10514ef3d38adbe6c4519f30f0f19304cb7e61e (diff)
downloadfedpkg-make-pull-89584987b3b0cc14566df8c0b3fd62713732ebca.tar.gz
fedpkg-make-pull-89584987b3b0cc14566df8c0b3fd62713732ebca.tar.xz
fedpkg-make-pull-89584987b3b0cc14566df8c0b3fd62713732ebca.zip
Continue attempting a build even if fedpkg-vcs fails if no previous build
This is sort of a hackaround for a networking issue in the Red Hat Phoenix data center.
-rwxr-xr-xfedpkg-pull-build-chain16
1 files changed, 9 insertions, 7 deletions
diff --git a/fedpkg-pull-build-chain b/fedpkg-pull-build-chain
index a12ff4e..623a21e 100755
--- a/fedpkg-pull-build-chain
+++ b/fedpkg-pull-build-chain
@@ -167,14 +167,16 @@ def main():
args.extend(['pull-retarget', 'HEAD'])
try:
check_call_verbose(args, stdout=sys.stdout, stderr=sys.stderr, cwd=release_dir)
+ f = open('pull-status')
+ was_updated = f.readline() == 'updated'
+ f.close()
except subprocess.CalledProcessError, e:
- print "Failed: " + unicode(e)
- failed.append(arg)
- continue
-
- f = open('pull-status')
- was_updated = f.readline() == 'updated'
- f.close()
+ print "fedpkg-vcs failed: " + unicode(e)
+ if last_build_succeeded:
+ failed.append(arg)
+ continue
+ else:
+ was_updated = False
if not was_updated and last_build_succeeded:
print "No updates and have a previous successful build, nothing to do"