Skip to content

Preserve mtimes from input tar files in TarFileWriter output tars #155

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

Merged
aiuto merged 3 commits into from
Apr 21, 2020
Merged

Preserve mtimes from input tar files in TarFileWriter output tars #155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
817592c
Preserve mtimes from input tar files in TarFileWriter output tars
dannysullivan Apr 16, 2020
5629d29
Provide option for overriding input tar mtimes in TarFileWriter
dannysullivan Apr 17, 2020
43e6c9e
Correctly set test fixture paths in archive test
dannysullivan Apr 20, 2020
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
1 change: 0 additions & 1 deletion pkg/archive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ def add_tar(self,
intar = tarfile.open(name=tar, mode=inmode)
for tarinfo in intar:
if name_filter is None or name_filter(tarinfo.name):
tarinfo.mtime = self.default_mtime
if rootuid is not None and tarinfo.uid == rootuid:
tarinfo.uid = 0
tarinfo.uname = 'root'
Expand Down
14 changes: 14 additions & 0 deletions pkg/tests/archive_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,20 @@ def testMergeTarRelocated(self):
f.add_tar(datafile, name_filter=lambda n: n != "./b", root="/foo")
self.assertTarFileContent(self.tempfile, content)

def testPreserveInputTarMtimes(self):
input_tar_path = os.path.join(testenv.TESTDATA_PATH, "tar_test.tar")
with archive.TarFileWriter(self.tempfile) as f:
f.add_tar(input_tar_path)

with tarfile.open(input_tar_path, "r:") as input_tar:
input_mtimes = {}
for input_file in input_tar:
input_mtimes[input_file.name] = input_file.mtime

with tarfile.open(self.tempfile, "r:") as output_tar:
for output_file in output_tar:
self.assertEqual(input_mtimes[output_file.name], output_file.mtime)

def testAddingDirectoriesForFile(self):
with archive.TarFileWriter(self.tempfile) as f:
f.add_file("d/f")
Expand Down