aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/import_dsc.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-10-13 11:20:32 +0200
committerGuido Günther <agx@sigxcpu.org>2017-10-13 11:20:32 +0200
commitd0ee56bc0e6d53ee952d9c4e30dbe78e40e18383 (patch)
tree3d74e850e52193048a6fa1fe8626013c751862ce /gbp/scripts/import_dsc.py
parent4b9789a72485a45d075cd7865822bbd5de3cfe2d (diff)
import-dsc: don't create pristine-tar commits on every import
We must not create pristine-tar commits if no new upstream sources were imported. Othewise we'd create them on every Debian revision. This does not waste space since commits are identical but does waste time.
Diffstat (limited to 'gbp/scripts/import_dsc.py')
-rw-r--r--gbp/scripts/import_dsc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index cf2acc88..e2fba953 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -496,9 +496,11 @@ def main(argv):
if dsc.native:
import_native(repo, source, dsc, options)
else:
+ imported = False
commit = repo.find_version(options.upstream_tag, dsc.upstream_version)
if not repo.find_version(options.upstream_tag, dsc.upstream_version):
commit = import_upstream(repo, source, dsc, options)
+ imported = True
if (options.create_missing_branches and not repo.has_branch(options.debian_branch)):
repo.create_branch(options.debian_branch, commit)
@@ -508,7 +510,7 @@ def main(argv):
else:
gbp.log.warn("Didn't find a diff to apply.")
- if options.pristine_tar:
+ if imported and options.pristine_tar:
repo.create_pristine_tar_commits(commit,
dsc.tgz,
dsc.additional_tarballs.items())