release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue #414

Browse source
This commit is contained in:
Jerzy Drozdz 2022-09-29 13:50:16 +02:00 • committed by Jakub Kadlčík
parent f5d61594e3
commit 4f2037a541
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/tito/builder/submodule_aware_builder.py
View file

@ -67,14 +67,13 @@ class SubmoduleAwareBuilder(Builder):
self.spec_file = os.path.join( self.spec_file = os.path.join(
self.rpmbuild_gitcopy, self.spec_file_name) self.rpmbuild_gitcopy, self.spec_file_name)
def run_git_archive(self, relative_git_dir, prefix, commit, dest_tar, subdir): def run_git_archive(self, relative_git_dir, prefix, commit, dest_tar, subdir=None):
# command to generate a git-archive # command to generate a git-archive
git_archive_cmd = 'git archive --format=tar --prefix=%s/ %s:%s --output=%s' % ( git_archive_cmd = 'git archive --format=tar --prefix=%s/ %s:%s --output=%s' % (
prefix, commit, relative_git_dir, dest_tar) prefix, commit, relative_git_dir, dest_tar)
if subdir is None: if subdir is None:
run_command(git_archive_cmd) return run_command(git_archive_cmd)
return
with chdir(subdir) as p: with chdir(subdir) as p:
run_command(git_archive_cmd) run_command(git_archive_cmd)
@ -132,7 +131,7 @@ class SubmoduleAwareBuilder(Builder):
# git rev-parse <commit>:./<submodule> # git rev-parse <commit>:./<submodule>
rev_parse_cmd = 'git rev-parse %s:./%s' % (commit, submodule) rev_parse_cmd = 'git rev-parse %s:./%s' % (commit, submodule)
submodule_commit = run_command(rev_parse_cmd) submodule_commit = run_command(rev_parse_cmd)
submodule_tar_file = '%s.%s' % (initial_tar, submodule) submodule_tar_file = '%s.%s' % (initial_tar, submodule.replace("/","_"))
# prefix should be <prefix>/<submodule> # prefix should be <prefix>/<submodule>
submodule_prefix = '%s/%s' % (prefix, submodule) submodule_prefix = '%s/%s' % (prefix, submodule)