[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Holger Levsen]

The following commit has been merged in the master branch:
commit 6484305c0e98412b11a1b88e31a20347b4c6f03d
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Nov 26 18:35:23 2011 +0100

    use apt.conf.d/piuparts instead of apt.conf
    
    Create piupart's apt config in the chroot as /etc/apt.conf.d/piuparts
    instead of /etc/apt.conf in order to allow overriding the settings from
    custom scripts by just dropping new config bits in e.g.
    /etc/apt/apt.conf.d/piuparts-foobar.
    apt.conf.d is supported in lenny, possibly earlier releases, too.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index d719cf8..7e30dee 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -814,7 +814,7 @@ class Chroot:
                     "".join(lines))
 
     def create_apt_conf(self):
-        """Create /etc/apt/apt.conf inside the chroot."""
+        """Create /etc/apt/apt.conf.d/piuparts inside the chroot."""
         lines = [
             'APT::Get::Assume-Yes "yes";\n',
             'APT::Install-Recommends "0";\n',
@@ -841,7 +841,7 @@ class Chroot:
         if settings.dpkg_force_confdef:
             lines.append('Dpkg::Options {"--force-confdef";};\n')
 
-        create_file(self.relative("etc/apt/apt.conf"),
+        create_file(self.relative("etc/apt/apt.conf.d/piuparts"),
             "".join(lines))
 
     def create_dpkg_conf(self):

-- 
piuparts git repository