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>

diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 5a462966738da512400777e17ec8e052341b21b0..6dc5b59710a6bd608fab7d8241c05f28d7832b73 100755 (executable)
--- 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'],