[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.1-13-g8aba1f3

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 8aba1f3df726ecac9943a7c089bc42b0c7df2eee
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Sun Nov 1 10:56:48 2009 -0800

    let apt-config settings override the environment variables to match apt's new behavior (closes: 553601)

diff --git a/debian/changelog b/debian/changelog
index 5816676..31b9cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,14 @@ apt-listbugs (0.1.2) UNRELEASED; urgency=low
     with titles matching a regexp when in apt mode (Closes: #553346)
   * improve speed by using Debian::Dpkg instead of dpkg -I, now that
     Debian::Dpkg works again (libdpkg-ruby1.8 0.3.3)
+  * let apt-config settings override the environment variables to match
+    apt's new behavior (closes: 553601)
 
   [ Francesco Poli (t1000) ]
   * added robustness checks to aptcleanup to cope with obsolete packages
   * dropped obsolete example update-index.db
 
- -- Ryan Niebur <ryan at debian.org>  Sun, 01 Nov 2009 03:12:43 -0800
+ -- Ryan Niebur <ryan at debian.org>  Sun, 01 Nov 2009 10:57:23 -0800
 
 apt-listbugs (0.1.1) unstable; urgency=low
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 6868af9..1625ab7 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -184,11 +184,12 @@ class AppConfig
     end
 
     # http_proxy check
-    if ENV["http_proxy"] == nil 
       if /http_proxy='(.*)'/ =~ `apt-config #{@apt_conf} shell http_proxy acquire::http::proxy` 
         puts "proxy configuration from APT.CONF: #{$1}" if $DEBUG
         if $1 == 'DIRECT' || $1 == ''
           puts "Disabling proxy due to DIRECT, or empty string" if $DEBUG          
+          ENV.delete("http_proxy")
+          ENV.delete("soap_use_proxy")
         else
           ENV["http_proxy"] = $1
           ENV["soap_use_proxy"] = "on"
@@ -205,7 +206,6 @@ class AppConfig
           ENV["soap_use_proxy"] = "on"
         end
       end
-    end
 
     # command 
     command = ARGV.shift

-- 
apt-listbugs development tree