diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2008-02-08 17:17:26 +0100 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-02-08 17:17:26 +0100 |
| commit | 967cffabfb259edd7add5136eb7639df35bab5af (patch) | |
| tree | 3b89c935b43cf64ef15f2f1c91677146b078481a | |
| parent | d11c2a1b90a065739adcd754319f3924f8124972 (diff) | |
add --no-dch options
| -rw-r--r-- | docs/manpages/git-import-orig.sgml | 7 | ||||
| -rwxr-xr-x | git-import-orig | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml index 7e8fc1b2..e35c05b6 100644 --- a/docs/manpages/git-import-orig.sgml +++ b/docs/manpages/git-import-orig.sgml @@ -24,6 +24,7 @@ <arg><option>--verbose</option></arg> <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg> <arg><option>--no-merge</option></arg> + <arg><option>--no-dch</option></arg> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg> @@ -69,6 +70,12 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--no-dch</option></term> + <listitem> + <para>don't call dch after the import</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> diff --git a/git-import-orig b/git-import-orig index ade8437b..b2bb0351 100755 --- a/git-import-orig +++ b/git-import-orig @@ -98,6 +98,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="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", @@ -198,7 +200,8 @@ 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 - gbpc.Dch("%s-1" % version, 'New Upstream Version')() + if options.run_dch: + gbpc.Dch("%s-1" % version, 'New Upstream Version')() except gbpc.CommandExecFailed: raise GbpError, "Import of %s failed" % archive except GbpError, err: |