launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+473429@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/launchpad:fix-origin-check-bug into launchpad:master.

Commit message:
fix: only check for suffix when testing origin url

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~tushar5526/launchpad/+git/launchpad/+merge/473429
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/launchpad:fix-origin-check-bug into launchpad:master.

diff --git a/utilities/rocketfuel-setup b/utilities/rocketfuel-setup
index f0ced0a..8edae82 100755
--- a/utilities/rocketfuel-setup
+++ b/utilities/rocketfuel-setup
@@ -258,7 +258,7 @@ if ! git status; then
        Please delete $LP_TRUNK_PATH and run rocketfuel-setup again."
        exit 1
 fi
-if [ "$(git remote get-url origin)" != "//git.launchpad.net/launchpad" ]; then
+if [[ "$(git remote get-url origin)" != *"//git.launchpad.net/launchpad" ]]; then
   echo "ERROR: Your clone in $LP_TRUNK_PATH has an incorrect pull location, correcting now..."
   if ! git remote set-url origin git+ssh://git.launchpad.net/launchpad; then
     echo "ERROR: Unable to set trunk pull location to lp:launchpad"