summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-06-27 08:42:33 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-11-14 14:47:20 +0200
commit0bbf81d2661d869cdb2216b50fc5faf60cbce7be (patch)
tree6c769f3a05ad9185b48fd590fc34b0e8c3565608
parentee7d5fab453e51e296b25a8d9c5009d06481299e (diff)
downloadgit-buildpackage-0bbf81d2661d869cdb2216b50fc5faf60cbce7be.tar.gz
git-buildpackage-0bbf81d2661d869cdb2216b50fc5faf60cbce7be.tar.bz2
git-buildpackage-0bbf81d2661d869cdb2216b50fc5faf60cbce7be.zip
buildpackage_rpm: check submodules from the exported treeish
And not from the current working copy. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xgbp/scripts/buildpackage_rpm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 5a462966..6dc5b597 100755
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -63,7 +63,7 @@ def git_archive(repo, spec, output_dir, tmpdir_base, treeish, prefix,
# Remove extra slashes from prefix, will be added by git_archive_x funcs
prefix = prefix.strip('/')
try:
- if repo.has_submodules() and with_submodules:
+ if repo.has_submodules(treeish) and with_submodules:
repo.update_submodules()
git_archive_submodules(repo, treeish, output, tmpdir_base,
prefix, spec.orig_src['compression'],