]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
try release versioning whenever PDNS_TAG is set explicitly
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 3 May 2013 07:36:02 +0000 (09:36 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 3 May 2013 08:44:49 +0000 (10:44 +0200)
build-scripts/make-jenkins-version

index d55ae906e73915dd6fd30e13fac985d345eedb23..f632bd1060e85489f2a71608d91866fc488e7428 100755 (executable)
@@ -25,7 +25,7 @@ then
        source_version=git-${source_dbg}
        deb_version=0.0.${deb_dbg}
        rpm_version=0.0.${rpm_dbg}
-elif [[ $GIT_BRANCH = rel/* ]]
+elif [[ $GIT_BRANCH = rel/* ]] || [ $PDNS_TAG != HEAD ]
 then
        # on release branch
        product_version=${GIT_BRANCH#rel/}