From 404bc96fd3d21e5ab954251a3b036201e48870c3 Mon Sep 17 00:00:00 2001 From: Siegfried-Angel Gevatter Pujals Date: Mon, 29 Sep 2008 15:00:38 +0200 Subject: [PATCH] pbuilder-dist.new: remove proxy stuff as according to Laney pbuilder does that itself. --- pbuilder-dist.new | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pbuilder-dist.new b/pbuilder-dist.new index 48755bb..3b9329f 100755 --- a/pbuilder-dist.new +++ b/pbuilder-dist.new @@ -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