From 8ada32322e53fb820b2ee3e18b7a2cc22e78322a Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 27 Jun 2014 08:42:33 +0300 Subject: [PATCH] buildpackage_rpm: check submodules from the exported treeish And not from the current working copy. Change-Id: I5320bd977073e7d69c02782a8a232b4a622553e1 Signed-off-by: Markus Lehtonen --- gbp/scripts/buildpackage_rpm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index 5a46296..6dc5b59 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'], -- 2.7.4