[packages/rpm-build-tools: 2/3] Allow to rebuld auto/XX tag even if it is not on XX-branch

draenog draenog at pld-linux.org
Tue Aug 28 18:30:30 CEST 2012


commit b6c4f6ba867813c2e98a71e265504c2d096a4f9b
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Tue Aug 28 17:14:34 2012 +0100

    Allow to rebuld auto/XX tag even if it is not on XX-branch

 builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index 512e507..3796914 100755
--- a/builder.sh
+++ b/builder.sh
@@ -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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/e470917df8e50d96aef7aab5b87416aa2133cf83



More information about the pld-cvs-commit mailing list