[ooo-build-commit] bin/unpack

[Jan Holesovsky]

 bin/unpack |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit ec72cf09ce430e5dff30773f243ae28947313e69
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 26 15:44:19 2009 +0200

    Remove the old unpack dir, can cause troubles if not empty.
    
    * bin/unpack: Remove 'build/ooo' if not empty in the CGIT case.

diff --git a/bin/unpack b/bin/unpack
index 17553a4..38beb0b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -228,6 +228,10 @@ if test "z$OOO_GIT" = "z" ; then
 	    rm -rf $OOBUILDDIR
 	fi
 	mkdir $OOBUILDDIR
+	if test "$SOURCE_TYPE" = "CGIT" -a -d "$BUILDDIR/ooo" ; then
+	    echo "	removing the old unpack dir: $BUILDDIR/ooo"
+	    rm -rf "$BUILDDIR/ooo"
+	fi
 	for pkg in $CORE_PKGS; do
             echo "	unpacking $pkg..."
             ($OOO_DECOMPRESS_CMD "$SRCDIR/$OOO_SPLIT_PREFIX$pkg.tar.bz2" | $GNUTAR xpf - ) || exit 1