make no-dch configurable via gbp.conf

1 files changed, 3 insertions, 3 deletions

diff --git a/git-import-orig b/git-import-orig
index 0bc43f73..22af1008 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -102,8 +102,8 @@ def main(argv):
                       help="verbose command execution")
     parser.add_option("--no-merge", dest='merge', action="store_false", default=True,
                       help="after import dont do any merging to another branch")
-    parser.add_option("--no-dch", dest='run_dch', action="store_false", default=True,
-                      help="don't call dch after the import")
+    parser.add_config_file_option(option_name="no-dch", dest='no_dch',
+                      help="don't call dch after the import", action="store_true")
     parser.add_config_file_option(option_name="debian-branch", dest='debian_branch',
                       help="branch the debian patch is being developed on, default is '%(debian-branch)s'")
     parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch",
@@ -219,7 +219,7 @@ on howto create it otherwise use --upstream-branch to specify it.
                     gitPullUpstream()
                 except gbpc.CommandExecFailed:
                     raise GbpError, """Merge failed, please resolve and run "dch -v %s-1".""" % version
-                if options.run_dch:
+                if not options.no_dch:
                     epoch = ''
                     if os.access('debian/changelog', os.R_OK):
                         cp = parse_changelog('debian/changelog')