[Piuparts-commits] [piuparts] 02/02: Revert "piuparts.py: Add /etc/init/startpar-bridge.conf to ignored_files to workaround #744398 in debsums."

[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 fa372d07c299037605c30bcecb2857d0c5d37020
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Apr 30 11:42:11 2014 +0200

    Revert "piuparts.py: Add /etc/init/startpar-bridge.conf to ignored_files to workaround #744398 in debsums."
    
    This reverts commit 04ccef952cc6c8a35a21a78e769e203355888507.
---
 debian/changelog | 1 -
 piuparts.py      | 2 --
 2 files changed, 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46ee242..aec5353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ piuparts (0.58) UNRELEASED; urgency=low
     - ignore multiarch definition in_default_debian_mirrors()
       (Closes: #711370)
     - Add to ignored_files:
-      + /etc/init/startpar-bridge.conf to workaround #744398 in debsums.
       + /etc/machine-id (Closes: #619244)
   * custom-scripts: add debugging output for resolvconf. (See #660350)
   * Adapt and rename conf/piuparts.apache to piuparts-master.conf as per
diff --git a/piuparts.py b/piuparts.py
index 178c4d9..dde1b84 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -310,8 +310,6 @@ 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",
-            # work around #744398 which is caused by #689508
-            "/etc/init/startpar-bridge.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