]> git.pld-linux.org Git - packages/rpm-build-tools.git/commitdiff
Allow to rebuld auto/XX tag even if it is not on XX-branch tag_checking
authorKacper Kornet <draenog@pld-linux.org>
Tue, 28 Aug 2012 16:14:34 +0000 (17:14 +0100)
committerKacper Kornet <draenog@pld-linux.org>
Tue, 28 Aug 2012 16:14:34 +0000 (17:14 +0100)
builder.sh

index 512e5077c57b1fe752a9a036bddea2fb4514189c..37969140cae8e7d319733249e709d77f1e82f57f 100755 (executable)
@@ -2482,7 +2482,7 @@ case "$COMMAND" in
                        tag_exist $TAGVER_CVS || [ $TAGVER_CVS = $CVSTAG ] || Exit_error err_tag_exists $TAGVER_CVS
                        # - do not allow to build from HEAD when XX-branch exists
                        TREE_PREFIX=$(echo "$TAG_PREFIX" | sed -e 's#^auto/\([a-zA-Z]\+\)/.*#\1#g')
-                       if [ "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
+                       if [ "$TAGVER" != "$CVSTAG" -a "$TAGVER_CVS" != "$CVSTAG" -a  "$TREE_PREFIX" != "$TAG_PREFIX" ]; then
                                TAG_BRANCH="${TREE_PREFIX}-branch"
                                if [ -n "$DEPTH" ]; then
                                        cmd_branches="git ls-remote --heads"
This page took 0.037981 seconds and 4 git commands to generate.