From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Sep 2017 17:55:13 +0000 (-0400)
Subject: script/build-integration-branch: check errors
X-Git-Tag: v12.2.6~144^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=392da84d611451fb8f817b0bb5c24c88d700f7fd;p=ceph.git

script/build-integration-branch: check errors

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 686f2ae7fa8050d6113674ea5570ad956792e49a)
---

diff --git a/src/script/build-integration-branch b/src/script/build-integration-branch
index 3e13ffb323fc..416d38e8b86f 100755
--- a/src/script/build-integration-branch
+++ b/src/script/build-integration-branch
@@ -42,17 +42,18 @@ print "branch %s" % branch
 
 # assemble
 print('--- creating branch %s' % branch)
-call(['git', 'branch', '-D', branch])
-call(['git', 'checkout', '-b', branch])
+r = call(['git', 'checkout', '-b', branch])
+assert not r
 for pr in prs:
     print('--- pr %d --- pulling %s branch %s' % (
         pr['number'],
         pr['head']['repo']['clone_url'],
         pr['head']['ref']))
-    call(['git', 'pull', '--no-edit',
+    r = call(['git', 'pull', '--no-edit',
           pr['head']['repo']['clone_url'],
           pr['head']['ref']
     ])
+    assert not r
 print('--- done. these PRs were included:')
 print('\n'.join(prtext))
 print('--- perhaps you want to: make && ctest -j12 && git push ci %s' % branch)