[ooo-build-commit] bin/tinbuild bin/unpack

[Thorsten Behrens]

 bin/tinbuild |    8 ++++----
 bin/unpack   |    5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit d542edfd57bb026bc04ebf9b1e6b1c512ce3050b
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Dec 8 01:06:02 2009 +0100

    Small fixes to tinderbuild
    
    * bin/tinbuild: use git log format instead of manual twiddling
    * bin/unpack: hack to make '--with-tag=dev300-latest' do the obvious

diff --git a/bin/tinbuild b/bin/tinbuild
index f9fce3f..73e1da2 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -18,14 +18,14 @@ usage ()
 
 reportError ()
 {
-	commit=`git log --pretty=oneline -n1`
-	author=`git log --pretty=short -n1 | sed -ne '/^Author: / s/^Author: //p'`
+	commit=`git log '--pretty=format:%h %cn - %s' -n1`
+	committer_mail=`git log '--pretty=format:%ce' -n1`
 
 	echo "$*" 1>&2
-	echo "Last commit: $author - $commit" 1>&2
+	echo "Last commit: $commit" 1>&2
 	if test $SEND_MAIL -eq 1; then
 		subject="tinderbox failure, last commit: $commit"
-		echo "$*" | mail -s "$subject" "$author"
+		echo "$*" | mail -s "$subject" "$committer_mail"
 	fi
 }
 
diff --git a/bin/unpack b/bin/unpack
index b83961d..e7631ca 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -273,6 +273,11 @@ else
         tree=$SRCDIR/clone/$pkg
         echo "* checking out $CVSTAG in $pkg..."
         (
+            # ugly hack to always checkout latest tag of given master
+            if echo $GITTAG | grep latest; then
+                GITTAG=`echo $GITTAG | sed -e ' s/_latest/*/'`
+                GITTAG=`git tag -l $GITTAG | tail -n1`
+            fi
             cd $tree
             if git show $CVSTAG >/dev/null 2>&1 ; then
                 git checkout $CVSTAG || exit 1