[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 0b456791e8021795dcb0f37da18167351ef27100



The following commit has been merged in the master branch:
commit 0b456791e8021795dcb0f37da18167351ef27100
Author: Russ Allbery <rra@debian.org>
Date:   Tue Jul 8 10:26:48 2008 -0700

    Remove the lab in postrm instead of prerm
    
    * debian/{prerm,postrm}:
      + [RA] Move prerm to postrm and remove the default /var/spool/lintian
        lab using shell instead of lintian.  We only want to remove the lab
        on purge, and purge is only passed to postrm, not prerm, by which
        point the lintian frontend is gone.  (Closes: #489860)

diff --git a/debian/changelog b/debian/changelog
index bcd66e8..b20a717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,11 @@ lintian (1.24.2) unstable; urgency=low
   * debian/copyright:
     + [FL] Add Patrick Schoenfeld (for checks/watch-file).
     + [ADB] Update repository information and GPL2 URL.
+  * debian/{prerm,postrm}:
+    + [RA] Move prerm to postrm and remove the default /var/spool/lintian
+      lab using shell instead of lintian.  We only want to remove the lab
+      on purge, and purge is only passed to postrm, not prerm, by which
+      point the lintian frontend is gone.  (Closes: #489860)
   
   * doc/CREDITS:
     + [FL] Add Raphael Geissert and Adam D. Barratt.
diff --git a/debian/postrm b/debian/postrm
new file mode 100755
index 0000000..183c845
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+# Try to purge the default lab if it looks like a lab.  If the user configured
+# a lab for some other location, currently we don't do anything about that.
+# Arguably we should parse lintianrc and remove that lab, but I'm not sure
+# that's a good idea.
+if [ "$1" = "purge" ]; then
+    if [ -d "/var/spool/lintian/binary" ]; then
+        rm -rf /var/spool/lintian/binary
+        rm -rf /var/spool/lintian/source
+        rm -rf /var/spool/lintian/udeb
+        rm -rf /var/spool/lintian/info
+    fi
+    rmdir --ignore-fail-on-non-empty /var/spool/lintian
+fi
+
+#DEBHELPER#
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 946029d..0000000
--- a/debian/prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "purge" ]; then
-  lintian --remove-lab
-fi
-
-#DEBHELPER#

-- 
Debian package checker


Reply to: