[SCM] live-helper branch, debian-next, updated. debian/2.0_a10-1-4-g7b43a64
Daniel Baumann
daniel at debian.org
Sat Apr 17 18:28:43 UTC 2010
The following commit has been merged in the debian-next branch:
commit 7b43a640ed0dd321151be9deaba28cfed9047a62
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Apr 17 20:23:27 2010 +0200
Don't fail on samhain workaround when we're cleaning up.
diff --git a/helpers/chroot_dpkg b/helpers/chroot_dpkg
index 1f1d57a..98ca282 100755
--- a/helpers/chroot_dpkg
+++ b/helpers/chroot_dpkg
@@ -85,7 +85,7 @@ EOF
elif [ -d /var/state/samhain ]
then
rm -f /var/state/samhain/samhain_file
- rmdir --ignore-fail-on-non-empty /var/state/samhain
+ rmdir --ignore-fail-on-non-empty /var/state/samhain || true
fi
# Restore start-stop-daemon program
--
live-helper
More information about the debian-live-changes
mailing list