pbuilder-dist: Do not force default value for --aptcache argument

Instead of passing the default from /usr/share/pbuilder/pbuilderrc to
pbuilder, let it be configured from the config files, e.g. ~/.pbuilderrc.
(LP: #956903)
This commit is contained in:
Daniel Hahler 2012-03-16 14:49:32 +01:00
parent 2e9d81bdda
commit dead85ee75
2 changed files with 6 additions and 2 deletions

7
debian/changelog vendored
View File

@ -1,11 +1,16 @@
ubuntu-dev-tools (0.140) UNRELEASED; urgency=low ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
[ Stefano Rivera ]
* Bump Standards-Version to 3.9.3, no changes needed. * Bump Standards-Version to 3.9.3, no changes needed.
* Update machine-readable copyright Format to 1.0. * Update machine-readable copyright Format to 1.0.
* pbuilder-dist: Use the same chroot, whether the system-architecture was * pbuilder-dist: Use the same chroot, whether the system-architecture was
the supplied architecture or was chosen by default (LP: #943435) the supplied architecture or was chosen by default (LP: #943435)
-- Stefano Rivera <stefanor@debian.org> Sat, 25 Feb 2012 16:09:53 +0200 [ Daniel Hahler ]
* pbuilder-dist: Do not force default value for `--aptcache` argument
(LP: #956903)
-- Daniel Hahler <ubuntu@thequod.de> Fri, 16 Mar 2012 14:47:24 +0100
ubuntu-dev-tools (0.139) unstable; urgency=low ubuntu-dev-tools (0.139) unstable; urgency=low

View File

@ -218,7 +218,6 @@ class PbuilderDist:
'--%s' % self.operation, '--%s' % self.operation,
'--distribution', self.target_distro, '--distribution', self.target_distro,
'--buildresult', result, '--buildresult', result,
'--aptcache', '/var/cache/apt/archives/',
'--override-config', '--override-config',
] ]