From: ianmdlvl <ianmdlvl>
Date: Thu, 28 Aug 2008 19:03:15 +0000 (+0000)
Subject: chiark-backup: really cope properly with nosnap removal
X-Git-Tag: debian_version_4_1_29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=f4c59bffade245468a0058cbece8bb731a1f3544

chiark-backup: really cope properly with nosnap removal
---

diff --git a/backup/nosnap b/backup/nosnap
index b9d57ab..6b8db64 100755
--- a/backup/nosnap
+++ b/backup/nosnap
@@ -3,11 +3,7 @@
 set -e
 
 removes () {
-	if test -d "$vardir/snap-mount"; then
-		rmdir -- "$vardir/snap-mount"
-	else
-		rm -f -- "$vardir/snap-mount"
-	fi
+	rmdir -- "$vardir/snap-mount" || rm -f -- "$vardir/snap-mount"
 	rm -f -- "$vardir/snap-device"
 }
 
diff --git a/debian/changelog b/debian/changelog
index 65a7fcd..25a7ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ chiark-utils (4.1.29) unstable; urgency=low
 
   * backup-snaprsync: pass $vardir as argument to snap-drop
   * backup-snaprsync: add a missing x prefix to an ssh invocation
+  * chiark-backup: really cope properly with nosnap removal
 
- -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 28 Aug 2008 19:54:34 +0100
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Thu, 28 Aug 2008 20:02:47 +0100
 
 chiark-utils (4.1.28) unstable; urgency=high