meta-closes: Move help text to GbpOptionParser.help

diff --git a/gbp/config.py b/gbp/config.py
index 0c9f885..da1808c 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -211,6 +211,8 @@ class GbpOptionParser(OptionParser):
                   "Include the full commit message instead of only the first line, default is '%(full)s'",
              'meta':
                   "Parse meta tags in commit messages, default is '%(meta)s'",
+             'meta-closes':
+                  "Meta tags for the bts close commands, default is '%(meta-closes)s'",
              'ignore-new':
                   "Build with uncommited changes in the source tree, default is '%(ignore-new)s'",
              'ignore-branch':

diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 56185d3..b8a86a7 100755 (executable)
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -353,8 +353,7 @@ def build_parser(name):
                       help="Increment the Debian release number for a security upload and add a security upload changelog comment.")
     version_group.add_boolean_config_file_option(option_name="git-author", dest="use_git_author")
     commit_group.add_boolean_config_file_option(option_name="meta", dest="meta")
-    commit_group.add_config_file_option(option_name="meta-closes", dest="meta_closes",
-                      help="Meta tags for the bts close commands, default is '%(meta-closes)s'")
+    commit_group.add_config_file_option(option_name="meta-closes", dest="meta_closes")
     commit_group.add_boolean_config_file_option(option_name="full", dest="full")
     commit_group.add_config_file_option(option_name="id-length", dest="idlen",
                       help="include N digits of the commit id in the changelog entry, default is '%(id-length)s'",