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

pbuilder-dist: Set different aptcache directories for Debian and Ubuntu.

Browse Source
This commit is contained in:
Benjamin Drung 2014-04-15 12:03:14 +02:00
parent b0209ce796
commit 12ee7e71e3
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -9,6 +9,10 @@ ubuntu-dev-tools (0.153) UNRELEASED; urgency=medium
* check-mir: correctly parse dependencies with architecture specifications * check-mir: correctly parse dependencies with architecture specifications
(LP: #1149679). (LP: #1149679).
[ Benjamin Drung ]
* pbuilder-dist:
- Set different aptcache directories for Debian and Ubuntu.
-- Stefano Rivera <stefanor@debian.org> Tue, 25 Feb 2014 22:45:05 +0200 -- Stefano Rivera <stefanor@debian.org> Tue, 25 Feb 2014 22:45:05 +0200
ubuntu-dev-tools (0.152+nmu1) unstable; urgency=medium ubuntu-dev-tools (0.152+nmu1) unstable; urgency=medium

13
pbuilder-dist
View File

@ -287,6 +287,8 @@ class PbuilderDist(object):
if self.enable_proposed: if self.enable_proposed:
othermirrors.append('deb %s %s-proposed-updates %s' othermirrors.append('deb %s %s-proposed-updates %s'
% (mirror, self.target_distro, components)) % (mirror, self.target_distro, components))
aptcache = os.path.join(self.base, 'aptcache', 'debian')
else: else:
try: try:
dev_release = self.target_distro == UbuntuDistroInfo().devel() dev_release = self.target_distro == UbuntuDistroInfo().devel()
@ -308,6 +310,8 @@ class PbuilderDist(object):
othermirrors.append('deb %s %s-proposed %s' othermirrors.append('deb %s %s-proposed %s'
% (mirror, self.target_distro, components)) % (mirror, self.target_distro, components))
aptcache = os.path.join(self.base, 'aptcache', 'ubuntu')
if 'OTHERMIRROR' in os.environ: if 'OTHERMIRROR' in os.environ:
othermirrors += os.environ['OTHERMIRROR'].split('|') othermirrors += os.environ['OTHERMIRROR'].split('|')
@ -336,7 +340,14 @@ class PbuilderDist(object):
'--keyring=/usr/share/keyrings/debian-archive-keyring.gpg', '--keyring=/usr/share/keyrings/debian-archive-keyring.gpg',
] ]
arguments += ['--components', components] arguments += ['--aptcache', aptcache, '--components', components]
if not os.path.isdir(aptcache):
try:
os.makedirs(aptcache)
except OSError:
Logger.error('Cannot create aptcache directory "%s"', aptcache)
sys.exit(1)
if self.build_architecture != self.system_architecture: if self.build_architecture != self.system_architecture:
arguments += ['--debootstrapopts', arguments += ['--debootstrapopts',