Skip to content

avoid duplicate data in the tarball #18

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

Open
tanelandreson-veriff wants to merge 3 commits into
base: master
Choose a base branch
from
Open

avoid duplicate data in the tarball #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
536b492
avoid duplicate data in the tarball
tanelandreson-veriff Mar 23, 2026
df85169
Merge branch 'master' into avoid-duplicate-data-in-the-tarball
tanelandreson-veriff Mar 23, 2026
ea9074c
fix
tanelandreson-veriff Mar 23, 2026
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
18 changes: 17 additions & 1 deletion vmtool/tarball.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ def __init__(self, comp='xz', compresslevel=9):
Default is 9 for maximum compression of text scripts
"""
self.buf = io.BytesIO()
self.added_paths = set() # Track added paths to avoid duplicates

self.comp = comp
self.compresslevel = compresslevel

Expand Down Expand Up @@ -78,6 +80,11 @@ def add_file_data(self, fpath, data, mode=TAR_FILE_MODE, mtime=None):
fpath, data = self.filter_data(fpath, data)
if not fpath:
return

# Skip if already added
if fpath in self.added_paths:
return

if data is not origdata:
mtime = None
inf = tarfile.TarInfo(fpath)
Expand All @@ -100,6 +107,7 @@ def add_file_data(self, fpath, data, mode=TAR_FILE_MODE, mtime=None):
inf.size = len(data)

self.tf.addfile(inf, io.BytesIO(data))
self.added_paths.add(fpath)

def add_dir(self, dpath, mode=TAR_DIR_MODE, mtime=None):
"""Add directory entry."""
Expand All @@ -108,7 +116,14 @@ def add_dir(self, dpath, mode=TAR_DIR_MODE, mtime=None):
if not dpath:
return

inf = tarfile.TarInfo(dpath + '/')
# Normalize directory path with trailing slash for tracking
dir_entry = dpath + '/'

# Skip if already added
if dir_entry in self.added_paths:
return

inf = tarfile.TarInfo(dir_entry)
inf.mtime = mtime or time.time()
inf.uid = 1000
inf.gid = 1000
Expand All @@ -117,6 +132,7 @@ def add_dir(self, dpath, mode=TAR_DIR_MODE, mtime=None):
inf.mode = mode
inf.type = tarfile.DIRTYPE
self.tf.addfile(inf)
self.added_paths.add(dir_entry)

def close(self):
"""Close tarball."""
Expand Down