[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.4-25-gc33b5e0

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 5ed34011f769c504851e2c2b9a59850b5c2bace6
Author: Carl Chenet <carl.chenet at ohmytux.com>
Date:   Fri Jun 12 00:25:27 2009 +0200

    configure mode asks for proxy address

diff --git a/bin/reportbug b/bin/reportbug
index 36d6837..5c31646 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -528,6 +528,15 @@ def offer_configuration(options):
              'don\'t need a user name.' % smtphost), empty_ok=True, force_prompt=True)
     else:
         smtpuser = ''
+
+    http_proxy = ui.get_string(
+       'Please enter the name of your proxy server.  It should only '
+       'use this parameter if you are behind a firewall. '
+       'The PROXY argument should be  formatted as a valid HTTP URL,'
+       ' including (if necessary) a port number;'
+       ' for example, http://192.168.1.1:3128/. '
+       'Just press ENTER if you don\'t have one or don\'t know.',
+       empty_ok=True, force_prompt=True)
     
     if os.path.exists(utils.USERFILE):
         try:
@@ -591,6 +600,10 @@ def offer_configuration(options):
             print >> fp, '#smtpuser "my username here"'
             print >> fp, '#smtppasswd "my password here"'
 
+    if http_proxy:
+        print >> fp, '# Your proxy server address'
+        print >> fp, 'http_proxy "%s"' % http_proxy
+
     if stupidmode:
         print >> fp, '# Disable fallback mode by commenting out the following:'
         print >> fp, 'no-cc'

-- 
Reportbug - reports bugs in the Debian distribution