[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.51-22-g9147fc5

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 0aaa44f441998fe5d832551c437ff0286c1ae4e7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 17 15:49:20 2013 +0200

    piuparts-slave.postrm: on purge, remove /var/cache/piuparts/tmp too.

diff --git a/debian/changelog b/debian/changelog
index fbb8673..b1c1b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ piuparts (0.52) UNRELEASED; urgency=low
     the navigation menu on the left.
   * piuparts.py: do not print a "Guessed: debian" line on every run. It's the
     default anyway. (Closes: #703058)
+  * piuparts-slave.postrm: on purge, remove /var/cache/piuparts/tmp too.
 
  -- Holger Levsen <holger at debian.org>  Wed, 15 May 2013 17:25:41 +0200
 
diff --git a/debian/piuparts-slave.postrm b/debian/piuparts-slave.postrm
index cc42d59..2308ec2 100644
--- a/debian/piuparts-slave.postrm
+++ b/debian/piuparts-slave.postrm
@@ -18,6 +18,9 @@ if [ "$1" = "purge" ] ; then
     rm -rf /var/cache/piuparts/basetgz/*.log
     rm -rf /var/cache/piuparts/basetgz/*.tar.gz
 
+    # rm -rf is safe if it's not mounted anymore
+    mount | grep -q /var/cache/piuparts/tmp || rm -rf /var/cache/piuparts/tmp
+    rmdir /var/cache/piuparts 2>/dev/null || true
 fi
 
 

-- 
piuparts git repository