[Reportbug-commits] [reportbug] 01/04: --tag cli option now correctly generates the list of available tags based on the selected mode, which includes 'security'; Closes: #685826

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository reportbug.

commit 60389048cfe85e9856c6543fb576374d181ca813
Author: Sandro Tosi <morph at debian.org>
Date:   Sat May 2 15:03:12 2015 -0400

    --tag cli option now correctly generates the list of available tags based on the selected mode, which includes 'security'; Closes: #685826
---
 bin/reportbug    | 7 ++++++-
 debian/changelog | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bin/reportbug b/bin/reportbug
index fb63c10..7f27b97 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -749,6 +749,11 @@ def verify_option(option, opt, value, parser, *args):
 
 def verify_append_option(option, opt, value, parser, *args):
     heading, valid = args
+    # special case --tag: in valid we pass a function reference
+    # as get_tags is dependant on the user mode, so we also have to convert
+    # the mode to the integer value expected... FIXME
+    if opt == '--tag':
+        valid = sorted(valid(mode=utils.MODELIST.index(parser.values.mode)).keys())+['none']
     if value == 'help':
         ewrite('%s:\n %s\n' % (heading, '\n '.join(valid)))
         sys.exit(1)
@@ -880,7 +885,7 @@ def main():
     parser.add_option('-T', '--tag', action='callback', dest='tags',
                       callback=verify_append_option,  type='string',
                       callback_args=('Permitted tags:',
-                                     sorted(debbugs.get_tags().keys())+['none']),
+                                     debbugs.get_tags),
                       help='add the specified tag to the report')
     parser.add_option('--http_proxy', '--proxy', help='use this proxy for '
                       'HTTP accesses')
diff --git a/debian/changelog b/debian/changelog
index 3c5ad4e..2e27595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ reportbug (6.6.4) UNRELEASED; urgency=medium
     - set default encoding to UTF-8, should prevent all the "UnicodeDecodeError:
       'ascii' codec can't decode" bugs; Closes: #769013, #739507, #761367,
       #771833, #672487, #739507, #612712, #690882, #779200, #642096, #666116
+    - --tag cli option now correctly generates the list of available tags based
+      on the selected mode, which includes 'security'; Closes: #685826
   * reportbug/{debbugs.py, ui/text_ui.py}, test/test_{debbugs.py, urlutils.py}
     - use HTTPS when connecting to Debian BTS
   * bin/reportbug, reportbug/ui/urwid_ui.py
@@ -31,7 +33,7 @@ reportbug (6.6.4) UNRELEASED; urgency=medium
     - support LANG declined Description-xx field in package information; thanks
       to Robert Luberda for the report; Closes: #683116
 
- -- Sandro Tosi <morph at debian.org>  Fri, 24 Apr 2015 21:37:28 -0400
+ -- Sandro Tosi <morph at debian.org>  Sat, 02 May 2015 15:00:19 -0400
 
 reportbug (6.6.3) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reportbug/reportbug.git