Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-12 01:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove proxy references - pbuilder seems to detect it fine

Browse Source
This commit is contained in:
Iain Lane 2008-09-29 14:01:34 +01:00
parent 43af4c2d54
commit 13ba43bddf
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pbuilder-dist.new
View File

@ -67,9 +67,6 @@ class pbuilder_dist:
# 'distribution' or 'distribution-architecture'. # 'distribution' or 'distribution-architecture'.
self.chroot_string = None self.chroot_string = None
# Proxy
self.proxy = None
# Authentication method # Authentication method
self.auth = 'sudo' self.auth = 'sudo'
@ -107,11 +104,6 @@ class pbuilder_dist:
self.target_distro = self.system_distro self.target_distro = self.system_distro
# if 'http_proxy' in os.environ:
# self.base = os.environ['http_proxy']
# elif 'HTTP_PROXY' in os.environ:
# self.base = os.environ['HTTP_PROXY']
############################################################## ##############################################################
def __getitem__(self, name): def __getitem__(self, name):
@ -212,14 +204,13 @@ 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')
arguments.append('--debootstrapopts "%(build_architecture)s"' % self) arguments.append('--debootstrapopts "%(build_architecture)s"' % self)
if self.proxy:
arguments.append('--http-proxy "%(proxy)s"' % self)
### $( [ $ISDEBIAN != "False" ] || echo "--aptconfdir \"${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/\"" ) \ ### $( [ $ISDEBIAN != "False" ] || echo "--aptconfdir \"${BASE_DIR}/etc/${DISTRIBUTION}/apt.conf/\"" ) \
# Append remaining arguments # Append remaining arguments