[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.47-41-ga9fc1b0

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 0ae1a918f4ab1add911f67782e0b66c546a3af7d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Oct 5 22:28:42 2012 +0200

    p: ignore *.dpkg-* conffile backups found in --scriptsdir dirs
    
    do not run the conffile backup files in the chroot :-)
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/TODO b/TODO
index ce9bd3b..ac805d5 100644
--- a/TODO
+++ b/TODO
@@ -10,9 +10,6 @@ for 0.48:
 - turn debsums dependency into a recommends and make piuparts.py refuse to run
   if debsums is not installed and no --no-debsums options is given.
 
-- ensure --scriptsdir does not copy *.dpkg-* backup files
-  (as that would mean running them in the chroot)
-
 - make piuparts-master + piuparts-slave packages work out-of-the-box:
   - conf/piuparts.sudoers should be split for master+slave packages.
   - ship sane minimal sudoers in p-s.deb than can be enabled by default
diff --git a/debian/changelog b/debian/changelog
index ff7c7cd..c82adee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ piuparts (0.48) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
   * piuparts.py:
+    - Ignore *.dpkg-* conffile backups found in --scriptsdir directories.
   * piuparts-master.py:
     - Enable recycling before initializing the real package db.
   * piuparts-slave.py:
diff --git a/piuparts.py b/piuparts.py
index dab73dc..28a36b5 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -785,7 +785,9 @@ class Chroot:
             for sdir in settings.scriptsdirs:
                 logging.debug("Copying scriptsdir %s to %s" % (sdir, dest))
                 for sfile in os.listdir(sdir):
-                    if (sfile.startswith("post_") or sfile.startswith("pre_")) and os.path.isfile(os.path.join(sdir, sfile)):
+                    if (sfile.startswith("post_") or sfile.startswith("pre_")) \
+                            and not ".dpkg-" in sfile \
+                            and os.path.isfile(os.path.join(sdir, sfile)):
                         shutil.copy(os.path.join(sdir, sfile), dest)
 
         # Run custom scripts after creating the chroot.

-- 
piuparts git repository