[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.46-19-g5ed50ea

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 504c9b0b0234dcfaf57c174e015cf542d564a4b8
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Sep 15 09:55:22 2012 +0200

    p: ignore /var/log/dbconfig-common/dbc.log
    
    dbconfig-common may be handled as a fake-essential package,
    so treat its logfile as part of the package management
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/custom-scripts/scripts-leftovers/post_purge_dbconfig_cleanup b/custom-scripts/scripts-leftovers/post_purge_dbconfig_cleanup
deleted file mode 100755
index 7ed6898..0000000
--- a/custom-scripts/scripts-leftovers/post_purge_dbconfig_cleanup
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-# If we didn't purge dbconfig-common (because it's fake-essential)
-# empty its logfile.
-if [ -f /var/log/dbconfig-common/dbc.log ]; then
-	>/var/log/dbconfig-common/dbc.log
-fi
diff --git a/debian/changelog b/debian/changelog
index aa8024c..1495195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ piuparts (0.47) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
   * piuparts.py:
+    - Add to ignored_files/ignored_patterns:
+      + /var/log/dbconfig-common/dbc.log
   * piuparts-master.py:
   * piuparts-slave.py:
   * piuparts-report.py:
@@ -11,6 +13,7 @@ piuparts (0.47) UNRELEASED; urgency=low
   * Rename custom script post_install_find_bad_permissions to
     pre_remove_50_find_bad_permissions to avoid early failures during upgrade
     tests that may be fixed in a later version.
+  * Remove post_purge_dbconfig_cleanup custom script.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Sat, 15 Sep 2012 06:25:05 +0200
 
diff --git a/debian/piuparts.maintscript b/debian/piuparts.maintscript
index 0140d47..a997f4b 100644
--- a/debian/piuparts.maintscript
+++ b/debian/piuparts.maintscript
@@ -1,2 +1,3 @@
 rm_conffile /etc/piuparts/piuparts.conf 0.45~
+rm_conffile /etc/piuparts/scripts-leftovers/post_purge_dbconfig_cleanup 0.47~
 mv_conffile /etc/piuparts/scripts/post_install_find_bad_permissions /etc/piuparts/scripts/pre_remove_50_find_bad_permissions 0.47~
diff --git a/piuparts.py b/piuparts.py
index 1bf6da2..5539b34 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -239,6 +239,7 @@ class Settings:
             "/var/log/apt/history.log",
             "/var/log/apt/term.log",
             "/var/log/bootstrap.log",
+            "/var/log/dbconfig-common/dbc.log",
             "/var/log/dpkg.log",
             # system logfiles
             "/var/log/auth.log",

-- 
piuparts git repository