Accepting request 136032 from openSUSE:Tools

add support of "20120916" as versions in git (forwarded request 135648 from jirislaby)

OBS-URL: https://build.opensuse.org/request/show/136032
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-tar_scm?expand=0&rev=11
This commit is contained in:
Stephan Kulow 2012-09-26 14:25:05 +00:00 committed by Git OBS Bridge
commit c2aa4e4559
2 changed files with 9 additions and 1 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Sep 24 11:47:27 UTC 2012 - jslaby@suse.com
- add --date=short to get_vesion of git and remove '-' chars
by sed. This allows us to use %ad as versionformat and
have something like "20120916" as version instead of
terrible Unix timestamps.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 27 11:16:47 UTC 2012 - aspiers@suse.com Fri Jul 27 11:16:47 UTC 2012 - aspiers@suse.com

View File

@ -402,7 +402,7 @@ get_version () {
case "$MYSCM" in case "$MYSCM" in
git) git)
#version=`safe_run git show --pretty=format:"$MYFORMAT" | head -n 1` #version=`safe_run git show --pretty=format:"$MYFORMAT" | head -n 1`
version=`safe_run git log -n1 --pretty=format:"$MYFORMAT"` version=`safe_run git log -n1 --date=short --pretty=format:"$MYFORMAT"|sed 's@-@@g'`
;; ;;
svn) svn)
#rev=`LC_ALL=C safe_run svn info | awk '/^Revision:/ { print $2 }'` #rev=`LC_ALL=C safe_run svn info | awk '/^Revision:/ { print $2 }'`