config: minor option parsing cleanup

Git-Dch: Ignore

diff --git a/gbp/config.py b/gbp/config.py
index a2856ba9a8c0369a8ed5d2509b523b5cd4f08255..c7e6f268f8764409fd1a6f1aab3a451bcd5320a1 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -174,7 +174,9 @@ class GbpOptionParser(OptionParser):
              'create-missing-branches':
                   "Create missing branches automatically, default is '%(create-missing-branches)s'",
              'submodules':
-                  "Transparently handle submodules in the upstream tree"
+                  "Transparently handle submodules in the upstream tree, default is '%(submodules)s'",
+             'postimport':
+                  "hook run after a successful import, default is '%(postimport)s'",
            }
     config_files = [ '/etc/git-buildpackage/gbp.conf',
                      os.path.expanduser('~/.gbp.conf'),

diff --git a/git-import-orig b/git-import-orig
index 2f5553c481930bfd243fc41345429647a24a0db8..f47a3e8d16cb1d63445553e0269d73f60027cf61 100755 (executable)
--- a/git-import-orig
+++ b/git-import-orig
@@ -221,8 +221,7 @@ def parse_args(argv):
                       dest="filter_pristine_tar")
     import_group.add_config_file_option(option_name="import-msg",
                       dest="import_msg")
-    cmd_group.add_config_file_option(option_name="postimport", dest="postimport",
-                      help="hook run after a successful import, default is '%(postimport)s'")
+    cmd_group.add_config_file_option(option_name="postimport", dest="postimport")
 
     parser.add_boolean_config_file_option(option_name="interactive",
                                           dest='interactive')