]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-backport.sh/interactive_setup: abort if Step 3 fails 31419/head
authorNathan Cutler <ncutler@suse.com>
Fri, 8 Nov 2019 14:14:10 +0000 (15:14 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 8 Nov 2019 14:14:10 +0000 (15:14 +0100)
Fixes confusing error message reported by a user:

Setup step 3 of 4 - remote repos
---------------------------------------------------------------------
Searching "git remote -v" for remote repos

ceph-backport.sh: ERROR: Cannot auto-determine fork remote
ceph-backport.sh: (Could not find GitHub user callithea's fork of ceph/ceph in
"git remote -v")
ceph-backport.sh: ERROR: (internal error) fork_remote not set, even after
completing Steps 1-3 of interactive setup
ceph-backport.sh: This could be reported as a bug!

Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/script/ceph-backport.sh

index 3c6a6b6cb8343602b78e21fd16842a79d48a6c64..d70b799679a9af6204a835535cd4f8bece093947 100755 (executable)
@@ -627,6 +627,7 @@ function interactive_setup_routine {
     init_upstream_remote
     init_fork_remote
     vet_remotes
+    [ "$setup_ok" ] || abort_due_to_setup_problem
     [ "$github_token" ] || assert_fail "github_token not set, even after completing Steps 1-3 of interactive setup"
     [ "$github_user" ] || assert_fail "github_user not set, even after completing Steps 1-3 of interactive setup"
     [ "$upstream_remote" ] || assert_fail "upstream_remote not set, even after completing Steps 1-3 of interactive setup"