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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2579cc42a53c79e609a07093c4f447e4b6deb16e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Aug 26 10:32:07 2016 +0200

    prepare_build: merge logic with trigger
---
 scripts/prepare_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index f161406..a6f687d 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -205,9 +205,9 @@ if [ -n "$CHECK_NEW_UPSTREAM" ]; then
     # ignore the "unstable" (*.*.70 + as well as the rc, alpha and beta tags) releases
     RELEASE_TAG=$(git tag --sort='version:refname' -l "$(expand_tag "$VERSIONS")" | \
         sed -n -r '
-/([789][0-9]+|(rc|alpha|beta)[0-9]*)$/d
 /^'"$UPSTREAM_RELEASE_TAG"'$/,$ {
     /^'"$UPSTREAM_RELEASE_TAG"'$/d
+    /([789][0-9]+|(rc|alpha|beta)[0-9]*)$/d
     p
 }' | tail -1)
 

-- 
pkg-kde-jenkins packaging