Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-30 04:11:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

If there's a "etc/<distro>/apt.conf" file inside the build result

Browse Source 
directory, pass it to pbuilder as --aptconfdir. Thanks to Paul Novotny
and Ryan Pavlik (LP: #363043).
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2009-08-16 00:18:24 +02:00
parent 5069952a4a
commit 1028885576
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -22,6 +22,9 @@ ubuntu-dev-tools (0.76) UNRELEASED; urgency=low
[ Siegfried-Angel Gevatter Pujals ] [ Siegfried-Angel Gevatter Pujals ]
* pbuilder-dist: * pbuilder-dist:
- Expand "~" in PBUILDFOLDER to the user's home directory. - Expand "~" in PBUILDFOLDER to the user's home directory.
- If there's a "etc/<distro>/apt.conf" file inside the build result
directory, pass it to pbuilder as --aptconfdir. Thanks to Paul Novotny
and Ryan Pavlik (LP: #363043).
-- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sun, 16 Aug 2009 00:11:09 +0200 -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Sun, 16 Aug 2009 00:11:09 +0200

4
pbuilder-dist
View File

@ -245,7 +245,9 @@ class pbuilder_dist:
arguments.append('--debootstrapopts --arch') arguments.append('--debootstrapopts --arch')
arguments.append('--debootstrapopts "%(build_architecture)s"' % self) arguments.append('--debootstrapopts "%(build_architecture)s"' % self)
### $( [ $ISDEBIAN != "False" ] || echo "--aptconfdir \"${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/\"" ) \ apt_conf_dir = os.path.join(self.base, 'etc/%(target_distro)s/apt.conf' % self)
if os.path.exists(apt_conf_dir):
arguments.append('--aptconfdir "%s"' % apt_conf_dir)
# Append remaining arguments # Append remaining arguments
if remaining_arguments: if remaining_arguments: