[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.3-14-gb27d17a

[Ryan Niebur]

The following commit has been merged in the master branch:
commit b27d17a17fb973584dfe7bbbb71ec54089f8fdb9
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Sun May 2 22:22:03 2010 +0200

    drop explicit soap_use_proxy setting requirement
    
    When http_proxy is set, but soap_use_proxy is not "on", do not complain:
    instead, make Ruby's SOAP happy (it seems to need this environment variable)
    without requiring apt-listbugs users to explicitly set soap_use_proxy="on"

diff --git a/apt-listbugs b/apt-listbugs
index 9e3e4ab..cba3f3b 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -144,9 +144,9 @@ apt-listbugs [-h] [-v] [-s <severities>] [-T <tags>] [-S <stats>] [-B <bug#>] [-
   this might be useful if you would like to script the use of a program that
   calls apt-listbugs.
 
-* http_proxy, soap_use_proxy=on
+* http_proxy
 
-  If http_proxy is set and soap_use_proxy is set, the value is used for HTTP Proxy.
+  If http_proxy is set, the value is used for HTTP Proxy.
   The default is to use the same value set for APT (in apt.conf).
 
 == CONFIGURATION FILE
diff --git a/debian/README.Debian b/debian/README.Debian
index 349ab72..ca870a3 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -127,15 +127,6 @@ APT_LISTBUGS_OPTS environment variable.
 Filing Bugs on apt-listbugs
 ===========================
 
-SOAP_USE_PROXY
---------------
-
-If you intend to file bug on why SOAP_USE_PROXY is required, please don't.
-There's already a bug filed as 399706.
-
-This bug is going to be fixed in future ruby1.8 upstream version of
-soap4r.
-
 Debugging apt-listbugs
 ----------------------
 
@@ -170,6 +161,3 @@ available from debbugs source:
 http://bugs.debian.org/debbugs-source/mainline/Debbugs/Bugs.pm
 
 
- -- Junichi Uekawa <dancer at debian.org>, Wed,  1 Oct 2008 20:50:27 -0700
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sat, 12 Sep 2009 18:51:15 +0200
-
diff --git a/debian/changelog b/debian/changelog
index ad7cfea..7b01781 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,12 +10,15 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
     package" (Closes: #574075)
   * clarified man page about proxy environment variables
   * switched to dpkg-source 3.0 (native) format
+  * dropped the requirement for the user to set soap_use_proxy environment
+    variable (this ruby module interface should not be exposed to application
+    users: see also bug #399706)
 
   [ Ryan Niebur ]
   * updated German translation, thanks Thomas Mueller! (Closes: #578305)
   * flush stdin after running the web browser (Closes: #578299)
 
- -- Ryan Niebur <ryan at debian.org>  Sun, 02 May 2010 09:49:38 -0700
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 02 May 2010 22:10:35 +0200
 
 apt-listbugs (0.1.3) unstable; urgency=low
 
diff --git a/lib/apt-listbugs/logic.rb b/lib/apt-listbugs/logic.rb
index 3ec212a..8822834 100644
--- a/lib/apt-listbugs/logic.rb
+++ b/lib/apt-listbugs/logic.rb
@@ -180,8 +180,10 @@ class AppConfig
     if ENV["HTTP_PROXY"] != nil && ENV["http_proxy"] == nil
       $stderr.puts _("W: sanity check failed: environment variable http_proxy is unset and HTTP_PROXY is set.")
     end
+
+    # enable proxy for SOAP
     if ENV["http_proxy"] != nil && ENV["soap_use_proxy"] != "on"
-      $stderr.puts _("W: sanity check failed: environment variable http_proxy is set and soap_use_proxy is not 'on'.")
+      ENV["soap_use_proxy"] = "on"
     end
 
     # http_proxy check
@@ -197,12 +199,12 @@ class AppConfig
         end
       end
       if /http_proxy='(.*)'/ =~ `apt-config #{@apt_conf} shell http_proxy acquire::http::proxy::bugs.debian.org` 
+        puts "proxy configuration from APT.CONF, specific for bugs.debian.org: #{$1}" if $DEBUG
         if $1 == 'DIRECT' 
           puts "Disabling proxy due to DIRECT" if $DEBUG
           ENV.delete("http_proxy")
           ENV.delete("soap_use_proxy")
         else
-          puts "proxy configuration from APT.CONF, specific for bugs.debian.org: #{$1}" if $DEBUG
           ENV["http_proxy"] = $1
           ENV["soap_use_proxy"] = "on"
         end

-- 
apt-listbugs development tree