chiark-backup: really cope properly with nosnap removal

diff --git a/backup/nosnap b/backup/nosnap
index b9d57ab21edf166d342c6c83c5e90ed97d061f97..6b8db642579e2d5c96a503ec907c8a4759ff5121 100755 (executable)
--- a/backup/nosnap
+++ b/backup/nosnap
@@ -3,11 +3,7 @@
 set -e
 
 removes () {
 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"
 }
 
        rm -f -- "$vardir/snap-device"
 }
 

diff --git a/debian/changelog b/debian/changelog
index 65a7fcdd5be2891e5b29bdd6f1aea67216afe79d..25a7ae744975326e8df463bcb987ed872e5c1ed3 100644 (file)
--- 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
 
   * 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
 
 
 chiark-utils (4.1.28) unstable; urgency=high