Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with Iain Lane's branch.

Browse Source
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-09-29 15:19:10 +02:00
commit ad7f9b9743
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pbuilder-dist.new
View File

@ -190,10 +190,12 @@ class pbuilder_dist:
'--logfile "%(logfile)s"' % self, '--logfile "%(logfile)s"' % self,
'--aptcache "/var/cache/apt/archives/"', '--aptcache "/var/cache/apt/archives/"',
### --mirror "${ARCHIVE}" \ ### --mirror "${ARCHIVE}" \
'--bindmounts "/var/cache/archive/"',
'--override-config', '--override-config',
] ]
if os.path.exists('/var/cache/archive/'):
arguments.append('--bindmounts "/var/cache/archive/"')
localrepo = '/var/cache/archive/%(target_distro)s' % self localrepo = '/var/cache/archive/%(target_distro)s' % self
if os.path.exists(localrepo): if os.path.exists(localrepo):
arguments.append('--othermirror ' +\ arguments.append('--othermirror ' +\
@ -202,6 +204,8 @@ class pbuilder_dist:
if self.target_distro in debian_distros: if self.target_distro in debian_distros:
arguments.append('--mirror "ftp://ftp.debian.org/debian"') arguments.append('--mirror "ftp://ftp.debian.org/debian"')
arguments.append('--components "main contrib non-free"') arguments.append('--components "main contrib non-free"')
else:
arguments.append('--components "main restricted universe multiverse"')
if self.build_architecture != self.system_architecture: if self.build_architecture != self.system_architecture:
arguments.append('--debootstrapopts --arch') arguments.append('--debootstrapopts --arch')