diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-27 08:42:33 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-06-30 18:28:22 +0300 |
| commit | 8ada32322e53fb820b2ee3e18b7a2cc22e78322a (patch) | |
| tree | 1f4ed33df9e041f1f09485897623acec9c7881d4 | |
| parent | 1ff2be668d6650103633566f86bd2e297d84c4fc (diff) | |
| download | git-buildpackage-8ada32322e53fb820b2ee3e18b7a2cc22e78322a.tar.gz git-buildpackage-8ada32322e53fb820b2ee3e18b7a2cc22e78322a.tar.bz2 git-buildpackage-8ada32322e53fb820b2ee3e18b7a2cc22e78322a.zip | |
buildpackage_rpm: check submodules from the exported treeish
And not from the current working copy.
Change-Id: I5320bd977073e7d69c02782a8a232b4a622553e1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rwxr-xr-x | gbp/scripts/buildpackage_rpm.py | 2 |
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'], |