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"
}
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).
- 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
* 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