[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.6-7-g0fd788b

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 0fd788b04ee59143ebddc82ac946cd8d118f6d1e
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Aug 18 09:42:06 2009 +0200

    'ldap' and 'no-ldap' options now issue a "Unrecognized token" warning: LDAP support is gone since years; thanks to martin f krafft for the report; Closes: #271057

diff --git a/debian/changelog b/debian/changelog
index c84c4b3..2a6bbcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,12 @@ reportbug (4.7) UNRELEASED; urgency=low
     - correctly call search_bugs() when filtering bugs (now passing package
       too); thanks to Vincent Lefevre for the report and Carl Chenet for the
       patch: Closes: #541408, #542119
+  * reportbug/utils.py
+    - 'ldap' and 'no-ldap' options now issue a "Unrecognized token" warning:
+       LDAP support is gone since years; thanks to martin f krafft for the
+       report; Closes: #271057
 
- -- Sandro Tosi <morph at debian.org>  Tue, 18 Aug 2009 08:37:35 +0200
+ -- Sandro Tosi <morph at debian.org>  Tue, 18 Aug 2009 09:39:44 +0200
 
 reportbug (4.6) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index fac6e8b..932b25d 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -844,8 +844,6 @@ def parse_config_files():
                     args['dontquery'] = (token == 'no-query-bts')
                 elif token in ('config-files', 'no-config-files'):
                     args['noconf'] = (token == 'no-config-files')
-                elif token in ('ldap', 'no-ldap'):
-                    pass
                 elif token in ('printonly', 'template', 'offline'):
                     args[token] = True
                 elif token in ('email', 'realname', 'replyto', 'http_proxy',

-- 
Reportbug - reports bugs in the Debian distribution