chiark-backup nosnap update from zealot

diff --git a/backup/nosnap b/backup/nosnap
index 6b8db642579e2d5c96a503ec907c8a4759ff5121..06187fac0bbfaf88ce821ee16369ba3fa535fac5 100755 (executable)
--- a/backup/nosnap
+++ b/backup/nosnap
@@ -3,7 +3,11 @@
 set -e
 
 removes () {
 set -e
 
 removes () {

-       rmdir -- "$vardir/snap-mount" || rm -f -- "$vardir/snap-mount"
+       if test -L "$vardir/snap-mount"; then
+               rm -f -- "$vardir/snap-mount"
+       elif test -d "$vardir/snap-mount"; then
+               rmdir -- "$vardir/snap-mount"
+       fi

        rm -f -- "$vardir/snap-device"
 }
 
        rm -f -- "$vardir/snap-device"
 }
 

diff --git a/debian/changelog b/debian/changelog
index 6608166d1763e5656af93b1219e4f2e9833dd949..ad951d4c3d926ac94e2df61be175d4533fef30bb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 chiark-utils (4.1.31) unstable; urgency=medium
 
 chiark-utils (4.1.31) unstable; urgency=medium
 

+  Bugfixes to programs:

   * xacpi-simple updated:
     - Now works with recent kernels by reading /sys/class/power_supply
       (so is now misnamed, since that may or may not come from acpi).
   * xacpi-simple updated:
     - Now works with recent kernels by reading /sys/class/power_supply
       (so is now misnamed, since that may or may not come from acpi).


@@ -14,6 +15,8 @@ chiark-utils (4.1.31) unstable; urgency=medium
     - Option -debug produces some debugging output.
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.
     - Option -debug produces some debugging output.
     - In the code, rename pix_... variables to be named after the meaning
       rather than the default colour.

+  * chiark-backup's /etc/chiark-backup/snap/nosnap is now more careful
+    about rm vs. rmdir of its link/mountpoint/whatever.

 
   Documentation and description improvements:
   * watershed now installs its head doc comment in
 
   Documentation and description improvements:
   * watershed now installs its head doc comment in


@@ -36,7 +39,7 @@ chiark-utils (4.1.31) unstable; urgency=medium
   * Switch to git.  Move .cvsignores to .gitignore, etc.
   * Update my email address.
 
   * Switch to git.  Move .cvsignores to .gitignore, etc.
   * Update my email address.
 

- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Jun 2012 02:26:53 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 06 Jun 2012 02:30:50 +0100

 
 chiark-utils (4.1.30) unstable; urgency=low
 
 
 chiark-utils (4.1.30) unstable; urgency=low