[Monotone-commits-diffs] org.debian.monotone: bd26a78bb7243353b9b3ebd73e24b15b7d640bae

[code]

revision:            bd26a78bb7243353b9b3ebd73e24b15b7d640bae
date:                2010-06-23T23:59:51
author:              address@hidden
branch:              org.debian.monotone
changelog:
Delete server log files on purge.

manifest:
format_version "1"

new_manifest [809a3e52b50c19b992156ac36703b908144f2496]

old_revision [1bd7988cebaf61243c299097a486a81b66d39fff]

patch "changelog"
 from [3fb0b55eac6373b9c163747668dc495a5b1a3241]
   to [4a67a6ca2fb3f0c1a6efa8968c3141e2b44d47cf]

patch "monotone-server.postrm"
 from [22cbf57558b8bd4b613f82a965d8081fcf5e8d5d]
   to [c0e4b14cd4e68e04d124512de019131aeb366bf4]
============================================================
--- changelog	3fb0b55eac6373b9c163747668dc495a5b1a3241
+++ changelog	4a67a6ca2fb3f0c1a6efa8968c3141e2b44d47cf
@@ -4,9 +4,11 @@ monotone (0.48-1) UNRELEASED; urgency=lo
     - Incorporates 00-push-pull-sync-fail.diff and
       10-slow-branchy-ancestry.diff.
   * Fix monotone-server postrm script to delete auto-generated key during purge.
-    This broke when the filenames of keys started incorporating the key hash.
+    This became broken when the filenames of keys started incorporating the key
+    hash.
+  * Fix monotone-server postrm script to delete log files on purge. 
 
- -- Francis Russell <address@hidden>  Wed, 23 Jun 2010 17:52:34 +0100
+ -- Francis Russell <address@hidden>  Thu, 24 Jun 2010 00:55:27 +0100
 
 monotone (0.47-2) unstable; urgency=low
 
============================================================
--- monotone-server.postrm	22cbf57558b8bd4b613f82a965d8081fcf5e8d5d
+++ monotone-server.postrm	c0e4b14cd4e68e04d124512de019131aeb366bf4
@@ -20,6 +20,9 @@ MTN_KEY_DIR="${MTN_HOME}/keys"
 
 MTN_HOME="/var/lib/monotone"
 MTN_KEY_DIR="${MTN_HOME}/keys"
+MTN_LOG_DIR="/var/log/monotone"
+MAINLOG="${MTN_LOG_DIR}/mtn.log"
+ERRORLOG="${MTN_LOG_DIR}/error.log"
 
 locate_key()
 {
@@ -134,6 +137,14 @@ case "$1" in
 	   fi
 	   echo "warning: not deleting monotone user or group because $reason" >&2
        fi
+
+       # delete log files if they exist
+       if [ -d ${MTN_LOG_DIR} ]; then
+         rm -f ${MAINLOG}
+         rm -f ${ERRORLOG}
+         rmdir --ignore-fail-on-non-empty ${MTN_LOG_DIR}
+       fi
+
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;