[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 91f24b8b8266a25e32e9c52bc0ca0b0906b28dbd
Author: Clint Adams <schizo at debian.org>
Date:   Fri Oct 12 14:12:50 2007 +0000

    Apply fix from Dominique Quatravaux to avoid race condition with save files.  closes: #446351, #381016.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-133

diff --git a/debian/changelog b/debian/changelog
index b2d614e..b4a0138 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.8.2) unstable; urgency=low
+
+  * Apply fix from Dominique Quatravaux to avoid race condition with
+    save files.  closes: #446351, #381016.
+
+ -- Clint Adams <schizo at debian.org>  Fri, 12 Oct 2007 10:09:48 -0400
+
 fakeroot (1.8.1) unstable; urgency=low
 
   * Apply patch from Jan Kluka to avoid possibility of faked dropping
diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index 687ae37..dba738b 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -135,7 +135,7 @@ PID=`echo $KEY_PID|cut -d: -f2`
 if [ "$WAITINTRAP" -eq 0 ]; then
   trap "kill -s @signal@ $PID" EXIT INT
 else
-  trap "kill -s @signal@ $PID ; wait $PID >/dev/null 2>&1" EXIT INT
+  trap 'FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS"  LD_PRELOAD="$LIB" /bin/ls -l / >/dev/null 2>&1; while kill -s @signal@ $PID 2>/dev/null; do sleep 0.1; done' EXIT INT
 fi
 
 if test -z "$FAKEROOTKEY" || test -z "$PID"; then

-- 
fakeroot