[pkg-perl-tools] 02/04: scripts/upstream-repo: some more nesting of checkrepourl between checks for $REPO

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository pkg-perl-tools.

commit 6cacb02fb255f3f0086fcb018cbccc25f4a61529
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Jun 30 14:36:34 2016 +0200

    scripts/upstream-repo: some more nesting of checkrepourl between checks for $REPO
    
    Gbp-Dch: Ignore
---
 scripts/upstream-repo | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/upstream-repo b/scripts/upstream-repo
index f9a61d6..15ade8d 100755
--- a/scripts/upstream-repo
+++ b/scripts/upstream-repo
@@ -78,11 +78,13 @@ if ! git remote show | grep -qx upstream-repo ; then
 		repofrommetadata
 	fi
 
-	checkrepourl
 	if [ -n "$REPO" ] ; then
-		warn "Adding Git remote 'upstream-repo' with URL '$REPO' ..."
-		git remote add upstream-repo "$REPO"
-		git fetch upstream-repo
+		checkrepourl
+		if [ -n "$REPO" ] ; then
+			warn "Adding Git remote 'upstream-repo' with URL '$REPO' ..."
+			git remote add upstream-repo "$REPO"
+			git fetch upstream-repo
+		fi
 	else
 		warn "No upstream Git URL found in 'debian/copyright' or 'debian/upstream/metadata'. Run 'git remote add upstream-repo <URL>' manually to track upstream."
 	fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git