[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 724a36e8e458767b14a602974792c00d57fb9139

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 724a36e8e458767b14a602974792c00d57fb9139
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 22 21:44:19 2009 +0100

    Always rm /tmp/data.tar.gz prior to ar-x-ing a deb
    
    Luca observed that while the regular ar is overwriting
    a file that is already existing, the busybox variant
    does not. The patch now removes the target should it already
    exist. Luca also rightfully pointed out that this
    circumvention is wrong, busybox should instead do the
    right thing and behave like the regular ar.

diff --git a/install.sh b/install.sh
index 59596da..9824374 100755
--- a/install.sh
+++ b/install.sh
@@ -485,6 +485,7 @@ action_testing () {
 		echo "W: tar does not support gzip archives"
 		echo "Downloading tar package"
 		wget $TAR_PACKAGE -O /tmp/tar.deb
+		rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
 		( cd /tmp && ar -x tar.deb data.tar.gz )
 		mkdir -p /usr/local
 		gunzip -c /tmp/data.tar.gz | tar -x -C /usr/local/
@@ -499,6 +500,7 @@ action_testing () {
 			# and then try to install the Debian dosfstools
 			echo "Downloading dosfstools package"
 			wget $DOSFSTOOLS_PACKAGE -O /tmp/dosfstools.deb
+			rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
 			( cd /tmp && ar -x dosfstools.deb data.tar.gz )
 			tar -xz -C / -f /tmp/data.tar.gz
 			rm -f /tmp/data.tar.gz
@@ -739,6 +741,7 @@ action_debian () {
 
 	echo " * Downloading cdebootstrap package"
 	wget $CDEBOOTSTRAP_PACKAGE -O /tmp/cdebootstrap.deb
+	rm -f /tmp/data.tar.gz # FIXME: ar should just overwrite it
 	( cd /tmp && ar -x cdebootstrap.deb data.tar.gz )
 	tar -xz -C / -f /tmp/data.tar.gz
 	rm -f /tmp/data.tar.gz

-- 
Various non-packaged files