[ooo-build-commit] Branch 'ooo-build-3-1-1' - bin/unpack

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Nov 26 09:02:39 PST 2009


 bin/unpack |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad74c39d902a918edb6fe1d497719693c2ebeb1a
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Thu Nov 26 17:59:50 2009 +0100

    Proper error handling during tree checkout in unpack
    
    * bin/unpack: now errors out when switching upstream git trees to
      requested branch fails (e.g. due to modified trees)

diff --git a/bin/unpack b/bin/unpack
index c2e1a38..9e163ac 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -255,7 +255,7 @@ else
             else
                 git checkout -b $CVSTAG $GITTAG || exit 1
             fi
-        )
+        ) || exit 1
         echo "* copying it into place..."
         rsync -a --exclude .git $tree/* $OOBUILDDIR/
     done


More information about the ooo-build-commit mailing list