aboutsummaryrefslogtreecommitdiffhomepage
path: root/git-import-dsc
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2010-12-20 10:55:46 +0100
committerGuido Günther <agx@sigxcpu.org>2010-12-20 11:08:36 +0100
commit29feba8882bda6f52a88673a8ff8778716a347fe (patch)
tree4bd64fa1d99c36de157d5f250ef76f33605166b6 /git-import-dsc
parent8a46f74fba05a243142cdfda979b15ce76334b57 (diff)
Change --ignore-same-version to --allow-same-version
and properly document it. This matches the defaults we had since ages.
Diffstat (limited to 'git-import-dsc')
-rwxr-xr-xgit-import-dsc10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-import-dsc b/git-import-dsc
index 017465c4..c93f01be 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -193,9 +193,9 @@ def main(argv):
dest="filters", action="append")
import_group.add_boolean_config_file_option(option_name="pristine-tar",
dest="pristine_tar")
- import_group.add_option("--ignore-same-version", action="store_true",
- dest="ignore_same_version", default=False,
- help="don't import already imported version")
+ import_group.add_option("--allow-same-version", action="store_true",
+ dest="allow_same_version", default=False,
+ help="allow to import already imported version")
(options, args) = parser.parse_args(argv[1:])
gbp.log.setup(options.color, options.verbose)
@@ -247,8 +247,8 @@ def main(argv):
if repo.find_version(options.debian_tag, src.version):
gbp.log.warn("Version %s already imported." % src.version)
- if options.ignore_same_version:
- gbp.log.info("Moving tag of version %s since import forced, src.ver")
+ if options.allow_same_version:
+ gbp.log.info("Moving tag of version '%s' since import forced" % src.version)
move_tag_stamp(repo, options.debian_tag, src.version)
else:
raise SkipImport