mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-13 08:01:09 +00:00
Merge with Iain Lane's branch.
This commit is contained in:
commit
ad7f9b9743
@ -190,10 +190,12 @@ class pbuilder_dist:
|
||||
'--logfile "%(logfile)s"' % self,
|
||||
'--aptcache "/var/cache/apt/archives/"',
|
||||
### --mirror "${ARCHIVE}" \
|
||||
'--bindmounts "/var/cache/archive/"',
|
||||
'--override-config',
|
||||
]
|
||||
|
||||
if os.path.exists('/var/cache/archive/'):
|
||||
arguments.append('--bindmounts "/var/cache/archive/"')
|
||||
|
||||
localrepo = '/var/cache/archive/%(target_distro)s' % self
|
||||
if os.path.exists(localrepo):
|
||||
arguments.append('--othermirror ' +\
|
||||
@ -202,6 +204,8 @@ class pbuilder_dist:
|
||||
if self.target_distro in debian_distros:
|
||||
arguments.append('--mirror "ftp://ftp.debian.org/debian"')
|
||||
arguments.append('--components "main contrib non-free"')
|
||||
else:
|
||||
arguments.append('--components "main restricted universe multiverse"')
|
||||
|
||||
if self.build_architecture != self.system_architecture:
|
||||
arguments.append('--debootstrapopts --arch')
|
||||
|
Loading…
x
Reference in New Issue
Block a user