aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/buildpackage.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-01-17 20:10:00 +0100
committerGuido Günther <agx@sigxcpu.org>2017-01-17 20:11:07 +0100
commit0fdff8e5277f3388f3879039918b126b8cf9eae0 (patch)
treea1db65908e0b31409fdd6ea1203861ca2be8f907 /gbp/scripts/buildpackage.py
parent1140886c80d5ef029bfd7b37b9ff8a24f07e6a69 (diff)
buildpackage: Use commit instead of tree to create archive
This makes sure we use the timestamps of the commit when creating the tarball. Only applies when not using pristine-tar Thanks: Ximin Luo for investigating Closes: #851645
Diffstat (limited to 'gbp/scripts/buildpackage.py')
-rwxr-xr-xgbp/scripts/buildpackage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 8c5a8f94..5de60947 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -322,7 +322,7 @@ def git_archive_build_orig(repo, cp, output_dir, options):
gbp.log.debug("Building upstream tarball with compression '%s'%s" %
(options.comp_type,
"' -%s'" % comp_level if comp_level is not None else ''))
- main_tree = repo.tree_drop_dirs(upstream_tree, options.components)
+ main_tree = repo.tree_drop_dirs(upstream_tree, options.components) if options.components else upstream_tree
if not git_archive(repo, cp, output_dir, main_tree,
options.comp_type,
comp_level,