From: ianmdlvl <ianmdlvl>
Date: Mon, 26 Nov 2007 00:52:31 +0000 (+0000)
Subject: * chiark-backup: remove snap-mount properly whether it's a dir or a leaf
X-Git-Tag: debian_version_4_1_25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=refs%2Ftags%2Fdebian_version_4_1_25

* chiark-backup: remove snap-mount properly whether it's a dir or a leaf
  node (such as a symlink).
---

diff --git a/backup/nosnap b/backup/nosnap
index c1f16dd..b9d57ab 100755
--- a/backup/nosnap
+++ b/backup/nosnap
@@ -3,7 +3,12 @@
 set -e
 
 removes () {
-	rm -f -- "$vardir/snap-mount" "$vardir/snap-device"
+	if test -d "$vardir/snap-mount"; then
+		rmdir -- "$vardir/snap-mount"
+	else
+		rm -f -- "$vardir/snap-mount"
+	fi
+	rm -f -- "$vardir/snap-device"
 }
 
 vardir="$2"
diff --git a/backup/snap-common b/backup/snap-common
index f6e788a..52a2c41 100644
--- a/backup/snap-common
+++ b/backup/snap-common
@@ -53,7 +53,7 @@ lvmdevice2vgroup () {
 lvmdropcore () {
 	snmnt="$vardir/snap-mount"
 	umount -v "$snmnt" || true
-	test ! -d "$snmnt" || rmdir -- "$snmnt"
+	test ! -d "$snmnt" || rmdir -- "$snmnt" || rm -f "$snmnt"
 
 	set +e
 	old_lv_dev="$(readlink $vardir/snap-device)"
diff --git a/debian/changelog b/debian/changelog
index 25c885d..d2fd986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (4.1.25) unstable; urgency=low
+
+  * chiark-backup: remove snap-mount properly whether it's a dir or a leaf
+    node (such as a symlink).
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 26 Nov 2007 00:52:23 +0000
+
 chiark-utils (4.1.24) unstable; urgency=low
 
   * Change my email address in the Maintainer field so that