diff options
| author | Guido Günther <agx@sigxcpu.org> | 2019-04-26 13:44:08 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2019-04-26 13:47:33 +0200 |
| commit | 292edcf1ebe3e6bd7856562477209d1215db91d1 (patch) | |
| tree | 34544120589c772cc0ad3611f45d329beb3b1e5a /gbp | |
| parent | 6696656742cb6c56ea476a9d82eaffb9a6bbfcb6 (diff) | |
import_orig: Move upstream-vcs-tag's help to config
This way it can be shared.
Diffstat (limited to 'gbp')
| -rw-r--r-- | gbp/config.py | 5 | ||||
| -rw-r--r-- | gbp/scripts/import_orig.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gbp/config.py b/gbp/config.py index d9a3cfaa..cef355a8 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -375,7 +375,10 @@ class GbpOptionParser(OptionParser): 'repo-email': "Set repo email from the DEBFULLNAME and DEBEMAIL " "environment variables ('DEBIAN') or fallback to the " - "git configuration ('GIT'), default is '%(repo-email)s'" + "git configuration ('GIT'), default is '%(repo-email)s'", + 'upstream-vcs-tag': + "Upstream VCS tag added to the merge commit, " + "default is '%(upstream-vcs-tag)s'", } short_opts = { diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py index 01b1fc6d..14a87cba 100644 --- a/gbp/scripts/import_orig.py +++ b/gbp/scripts/import_orig.py @@ -337,8 +337,7 @@ def build_parser(name): dest="debian_branch") branch_group.add_config_file_option(option_name="upstream-branch", dest="upstream_branch") - branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag", - help="Upstream VCS tag add to the merge commit") + branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag") branch_group.add_boolean_config_file_option(option_name="merge", dest="merge") branch_group.add_config_file_option(option_name="merge-mode", dest="merge_mode") |