buildpackage_rpm: check submodules from the exported treeish
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Fri, 27 Jun 2014 05:42:33 +0000 (08:42 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Mon, 30 Jun 2014 15:28:22 +0000 (18:28 +0300)
And not from the current working copy.

Change-Id: I5320bd977073e7d69c02782a8a232b4a622553e1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gbp/scripts/buildpackage_rpm.py

index 5a46296..6dc5b59 100755 (executable)
@@ -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'],