[SCM] live-helper branch, debian-next, updated. debian/2.0_a9-1-5-gc4e04aa

Daniel Baumann daniel at debian.org
Sun Apr 4 17:38:12 UTC 2010


The following commit has been merged in the debian-next branch:
commit c4e04aa1e0a9f63a58dccb5d9013c0eeed8690c1
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 4 19:33:15 2010 +0200

    Don't fail when /var/state/samhain doesn't exist in samhain workaround.

diff --git a/helpers/chroot_dpkg b/helpers/chroot_dpkg
index c7cf38e..015e83e 100755
--- a/helpers/chroot_dpkg
+++ b/helpers/chroot_dpkg
@@ -82,7 +82,7 @@ EOF
 		if [ -e /var/state/samhain/samhain_file.orig ]
 		then
 			mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
-		else
+		elif [ -d /var/state/samhain ]
 			rm -f /var/state/samhain/samhain_file
 			rmdir --ignore-fail-on-non-empty /var/state/samhain
 		fi

-- 
live-helper



More information about the debian-live-changes mailing list