mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-14 00:21:08 +00:00
pbuilder-dist.new: remove proxy stuff as according to Laney pbuilder does that itself.
This commit is contained in:
parent
086890b756
commit
404bc96fd3
@ -67,9 +67,6 @@ class pbuilder_dist:
|
||||
# 'distribution' or 'distribution-architecture'.
|
||||
self.chroot_string = None
|
||||
|
||||
# Proxy
|
||||
self.proxy = None
|
||||
|
||||
# Authentication method
|
||||
self.auth = 'sudo'
|
||||
|
||||
@ -107,11 +104,6 @@ class pbuilder_dist:
|
||||
|
||||
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):
|
||||
@ -215,9 +207,6 @@ class pbuilder_dist:
|
||||
arguments.append('--debootstrapopts --arch')
|
||||
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/\"" ) \
|
||||
|
||||
# Append remaining arguments
|
||||
|
Loading…
x
Reference in New Issue
Block a user