From 45c6be52faa9cb2e84c1b8c78a67637206c726bc Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 12 Sep 2013 13:30:36 +0300 Subject: [PATCH] common/buildpackage: use GitRepository for submodules Initialize a GitRepository object for each submodule in git_archive_submodules(). Signed-off-by: Markus Lehtonen --- gbp/scripts/common/buildpackage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gbp/scripts/common/buildpackage.py b/gbp/scripts/common/buildpackage.py index 41c50ca..56e4cb0 100644 --- a/gbp/scripts/common/buildpackage.py +++ b/gbp/scripts/common/buildpackage.py @@ -74,10 +74,11 @@ def git_archive_submodules(repo, treeish, output, prefix, comp_type, comp_level, # generate each submodule's arhive and append it to the main archive for (subdir, commit) in repo.get_submodules(treeish): tarpath = [subdir, subdir[2:]][subdir.startswith("./")] + subrepo = GitRepository(os.path.join(repo.path, subdir)) gbp.log.debug("Processing submodule %s (%s)" % (subdir, commit[0:8])) - repo.archive(format=format, prefix='%s%s/' % (prefix, tarpath), - output=submodule_archive, treeish=commit, cwd=subdir) + subrepo.archive(format=format, prefix='%s%s/' % (prefix, tarpath), + output=submodule_archive, treeish=commit) if format == 'tar': CatenateTarArchive(main_archive)(submodule_archive) elif format == 'zip': -- 2.7.4