Author: mvidner Date: Wed May 20 13:17:48 2009 New Revision: 57259 URL: http://svn.opensuse.org/viewcvs/yast?rev=57259&view=rev Log: Make tmp/* branch tagging work, thus http://svn.opensuse.org/svn/yast/branches/tmp/SLE-11-SP1-Stash/network becomes http://svn.opensuse.org/svn/yast/tags/branch-SLE-11-SP1-Stash-2_17_93/networ... Modified: trunk/devtools/devtools/bin/tagversion trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/devtools/bin/tagversion URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/tagversion?rev=57259&r1=57258&r2=57259&view=diff ============================================================================== --- trunk/devtools/devtools/bin/tagversion (original) +++ trunk/devtools/devtools/bin/tagversion Wed May 20 13:17:48 2009 @@ -66,16 +66,18 @@ # means: print just the line on which the subst succeeded # URLs don't contain spaces so it's safe to use them as delimiters - svn info | sed -n -e 's@^URL: \(.*\)/\(trunk\|branches/[^/]*\)/\(.*\)$@\1 \2 \3@;T;p;q' | { + svn info | sed -n -e 's@^URL: \(.*\)/\(trunk\|branches/.*\)/\([^/]*\)$@\1 \2 \3@;T;p;q' | { # the pipe creates a subshell. the variables will be lost when it's left # therefore the {braces} read REPOSITORY BRANCH MODULE - - b=`echo "$BRANCH" | sed -n -e 's@^branches/SuSE-\([^/]*\)-Branch$@\1@;T;p'` - if [ "$b" ]; then - t=branch-$b-$v - else + : $REPOSITORY $BRANCH $MODULE + b=${BRANCH##branches*/} + b=${b#SuSE-} + b=${b%-Branch} + if [ "$b" = "trunk" ]; then t=stable-$v + else + t=branch-$b-$v fi URL_t=$REPOSITORY/tags/$t Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=57259&r1=57258&r2=57259&view=diff ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Wed May 20 13:17:48 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 20 13:17:00 CEST 2009 - mvidner@suse.cz + +- y2tool tagversion: fixed branch tagging for tmp/* branches such as + tmp/SLE-11-SP1-Stash. + +------------------------------------------------------------------- Wed May 6 14:52:13 CEST 2009 - jsrain@suse.cz - updates of oscupdate -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org