[Piuparts-commits] [piuparts] 01/04: p: ignore dangling symlink /etc/modules-load.d/modules.conf

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit f53ed7cb01d3254b6bfb3685422547d4a10bbdff
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Nov 15 23:09:16 2014 +0100

    p: ignore dangling symlink /etc/modules-load.d/modules.conf
    
    this is a compat symlink for /etc/modules (which usually does not exist)
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 5 +++++
 piuparts.py      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc4a7cc..ddde9ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * custom-scripts/scripts/post_purge_exceptions and pre_remove_exceptions:
     apply systemd exceptions for wheezy* and not only wheezy.
 
+  [ Andreas Beckmann ]
+  * piuparts.py:
+    - Add to ignored_files:
+      + /etc/modules-load.d/modules.conf  (dangling symlink to ../modules)
+
  -- Holger Levsen <holger at debian.org>  Sun, 26 Oct 2014 20:19:35 +0100
 
 piuparts (0.60) unstable; urgency=medium
diff --git a/piuparts.py b/piuparts.py
index 64c220a..07025b6 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -316,6 +316,7 @@ class Settings:
             # work around broken symlinks
             "/usr/lib/python2.6/dist-packages/python-support.pth",  #635493 and #385775
             "/usr/lib/python2.7/dist-packages/python-support.pth",
+            "/etc/modules-load.d/modules.conf",
             # work around #316521 dpkg: incomplete cleanup of empty directories
             "/etc/apache2/",
             "/etc/apache2/conf.d/",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git