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

pbuilder-dist.new: remove proxy stuff as according to Laney pbuilder does that itself.

Browse Source
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2008-09-29 15:00:38 +02:00
parent 086890b756
commit 404bc96fd3
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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):
@ -215,9 +207,6 @@ 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)
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