[SCM] pkg-kde-jenkins packaging branch, master, updated. d811dd13490c8b97d4a79be80e4cfa992874630d

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-jenkins.git;a=commitdiff;h=d75fe79

The following commit has been merged in the master branch:
commit d75fe79d59d31951b881dc3854a87833611fbce8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu May 12 13:14:34 2016 +0200

    The tag could be there and we might still not have decided whether to do a new release or not
---
 scripts/prepare_build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index bda7078..f161406 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -253,9 +253,10 @@ if ! git show-ref --verify --quiet "refs/tags/$UPSTREAM_TAG"; then
     gbp import-orig "${IMPORT_ORIG_ARGS[@]}" "$DOWNLOADED_TARBALL"
 fi
 # if new upstream release, use gbp import-orig to fetch the new tarball
-if [ -n "$NEW_UPSTREAM_RELEASE" ] && \
-    ! git show-ref --verify --quiet "refs/tags/$NEW_UPSTREAM_TAG"; then
-    gbp import-orig "${IMPORT_ORIG_ARGS[@]}" --uscan
+if [ -n "$NEW_UPSTREAM_RELEASE" ]; then
+    if ! git show-ref --verify --quiet "refs/tags/$NEW_UPSTREAM_TAG"; then
+        gbp import-orig "${IMPORT_ORIG_ARGS[@]}" --uscan
+    fi
     # Check if the upstream release includes any change at all
     if ! git diff --quiet "refs/tags/$UPSTREAM_TAG" "refs/tags/$NEW_UPSTREAM_TAG";
     then

-- 
pkg-kde-jenkins packaging