launchpad-reviewers team mailing list archive

[LaMont Jones <lamont.jones@xxxxxxxxxxxxx>]

LaMont Jones has proposed merging lp:~lamont/launchpad/bug-851934 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lamont/launchpad/bug-851934/+merge/75831

Tested on ain, live in-situ on ain and shedir.  Planning to roll lp-buildd_80 with this fix on monday.  Please land.
-- 
https://code.launchpad.net/~lamont/launchpad/bug-851934/+merge/75831
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lamont/launchpad/bug-851934 into lp:launchpad.

=== modified file 'lib/canonical/buildd/umount-chroot'
--- lib/canonical/buildd/umount-chroot	2010-12-21 17:52:32 +0000
+++ lib/canonical/buildd/umount-chroot	2011-09-16 23:28:27 +0000
@@ -26,5 +26,16 @@
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/home/buildd/.ccache"
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/var/cache/apt/archives"
 #$SUDO umount "$HOME/build-$BUILDID/chroot-autobuild/dev/shm"
-$GREP "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts | \
-      $CUT -d\  -f2 | $XARGS -r -n 1 $SUDO umount
+COUNT=0
+while $GREP "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts; do 
+    COUNT=$(($COUNT+1))
+    if [ $COUNT -ge 20 ]; then
+    	echo "failed to umount $HOME/build-$BUILDID/chroot-autobuild"
+	if [ -x /usr/bin/lsof ]; then
+	    /usr/bin/lsof "$HOME/build-$BUILDID/chroot-autobuild"
+	fi
+	exit 1
+    fi
+    $GREP "$HOME/build-$BUILDID/chroot-autobuild" /proc/mounts | \
+	  $CUT -d\  -f2 | $XARGS -r -n 1 $SUDO umount || sleep 1
+done