From 8c043136bb9358605ef250c9599e1e18d8d297aa Mon Sep 17 00:00:00 2001 From: Kacper Kornet Date: Sat, 30 Jun 2012 00:04:19 +0100 Subject: [PATCH] Accept @. in tags Git accepts tags with these characters. However the tags in which they were exchanged to _# still need to be checked for presence. Otherwise it would be possible to built the same package from two revisions: once in CVS, once in git. --- builder.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builder.sh b/builder.sh index edc1fac..3657197 100755 --- a/builder.sh +++ b/builder.sh @@ -1339,16 +1339,16 @@ make_tagver() { fi # NOTE: CVS tags may must not contain the characters `$,.:;@' - TAGVER=$(echo $TAG_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE | tr '[.@]' '[_#]') + TAGVER=$(echo $TAG_PREFIX$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_RELEASE) - # Remove #kernel.version_release from TAGVER because tagging sources + # Remove @kernel.version_release from TAGVER because tagging sources # could occur with different kernel-headers than kernel-headers used at build time. # besides, %{_kernel_ver_str} is not expanded. - # TAGVER=auto-ac-madwifi-ng-0-0_20070225_1#%{_kernel_ver_str} + # TAGVER=auto-ac-madwifi-ng-0-0_20070225_1@%{_kernel_ver_str} # TAGVER=auto-ac-madwifi-ng-0-0_20070225_1 - TAGVER=${TAGVER%#*} + TAGVER=${TAGVER%@*} echo -n "$TAGVER" } @@ -2468,6 +2468,8 @@ case "$COMMAND" in if [ -n "$TEST_TAG" ]; then local TAGVER=`make_tagver` tag_exist $TAGVER + # check also tags created in CVS + tag_exist $(echo $TAGVER | tr '[.@]' '[_#]') # - 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 -- 2.44.0