mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-11 00:41:28 +00:00
Don't use --override-config with operations other than update. (LP: #409696)
This commit is contained in:
parent
c58f620d09
commit
6e7a7bac35
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -12,6 +12,10 @@ ubuntu-dev-tools (0.140) UNRELEASED; urgency=low
|
|||||||
* pbuilder-dist: Do not force default value for `--aptcache` argument
|
* pbuilder-dist: Do not force default value for `--aptcache` argument
|
||||||
(LP: #956903)
|
(LP: #956903)
|
||||||
|
|
||||||
|
[ John S Gruber ]
|
||||||
|
* Don't use --override-config with operations other than update.
|
||||||
|
(LP: #409696)
|
||||||
|
|
||||||
-- Daniel Hahler <ubuntu@thequod.de> Fri, 16 Mar 2012 16:21:00 +0100
|
-- Daniel Hahler <ubuntu@thequod.de> Fri, 16 Mar 2012 16:21:00 +0100
|
||||||
|
|
||||||
ubuntu-dev-tools (0.139) unstable; urgency=low
|
ubuntu-dev-tools (0.139) unstable; urgency=low
|
||||||
|
@ -218,9 +218,11 @@ class PbuilderDist:
|
|||||||
'--%s' % self.operation,
|
'--%s' % self.operation,
|
||||||
'--distribution', self.target_distro,
|
'--distribution', self.target_distro,
|
||||||
'--buildresult', result,
|
'--buildresult', result,
|
||||||
'--override-config',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if self.operation == 'update':
|
||||||
|
arguments += ['--override-config']
|
||||||
|
|
||||||
if self.builder == 'pbuilder':
|
if self.builder == 'pbuilder':
|
||||||
arguments += ['--basetgz', prefix + '-base.tgz']
|
arguments += ['--basetgz', prefix + '-base.tgz']
|
||||||
elif self.builder == 'cowbuilder':
|
elif self.builder == 'cowbuilder':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user