Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix git archive for .gitattributes #445

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix git archive for .gitattributes #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e526d57
Fix git archive for `.gitattributes`
LecrisUT Feb 27, 2023
d008bd1
Fix tar prefix
LecrisUT Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tito/builder/submodule_aware_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _setup_sources(self):

def run_git_archive(self, relative_git_dir, prefix, commit, dest_tar, subdir=None):
# 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,
Expand Down
27 changes: 23 additions & 4 deletions src/tito/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,8 +868,8 @@ def create_tgz(git_root, prefix, commit, relative_dir,
initial_tar = "%s.initial" % basename

# command to generate a git-archive
git_archive_cmd = 'git archive --format=tar --prefix=%s/ %s:%s --output=%s' % (
prefix, commit, relative_git_dir, initial_tar)
git_archive_cmd = 'git archive --format=tar %s %s --output=%s' % (
commit, relative_git_dir, initial_tar)
run_command(git_archive_cmd)

# Run git-archive separately if --debug was specified.
Expand All @@ -878,14 +878,33 @@ def create_tgz(git_root, prefix, commit, relative_dir,
debug('git-archive fails if relative dir is not in git tree',
'%s > /dev/null' % git_archive_cmd)

fixed_tar = "%s.tar" % basename
fixed_tar_fh = open(fixed_tar, 'wb')
fixed_timestamp_tar = "%s.fixed_timestamp" % basename
fixed_tar_fh = open(fixed_timestamp_tar, 'wb')
try:
tarfixer = TarFixer(open(initial_tar, 'rb'), fixed_tar_fh, timestamp, commit)
tarfixer.fix()
finally:
fixed_tar_fh.close()

# Fix tar archive locations
fixed_tar = "%s.tar" % basename
# First normalize paths
relative_git_dir = relative_git_dir.removeprefix("/").removeprefix("./")
if relative_git_dir and not relative_git_dir.endswith("/"):
# Note: if relative_git_dir is empty, it should remain empty
relative_git_dir += "/"
prefix = prefix.removeprefix("/").removeprefix("./")
if not prefix.endswith("/"):
prefix += "/"
# Extract archive to a temp folder
tar_extract_transform_cmd = 'tar -xf %s --transform="s|^%s|tmp_extract/%s|g"' % (
fixed_timestamp_tar, relative_git_dir, prefix)
run_command(tar_extract_transform_cmd)
# Re-compress the archive
tar_create_cmd = 'tar -cf %s -C tmp_extract/ %s' % (
fixed_tar, prefix)
run_command(tar_create_cmd)

# It's a pity we can't use Python's gzip, but it doesn't offer an equivalent of -n
return run_command("gzip -n -c < %s > %s" % (fixed_tar, dest_tgz))

Expand Down