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

tar_writer.py: address duplicate dir warning regression #900

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

tar_writer.py: address duplicate dir warning regression #900

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b43283
`tar_writer.py`: address duplicate dir warning regression
Illedran Nov 15, 2024
19a7421
`tar_writer.py`: comment dir dup check
Illedran Nov 18, 2024
9e0a63f
`tar_writer.py`: omit warning for duplicate dirs
Illedran Nov 18, 2024
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
10 changes: 6 additions & 4 deletions pkg/private/tar/tar_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,12 @@ def _addfile(self, info, fileobj=None):
# Enforce the ending / for directories so we correctly deduplicate.
if not info.name.endswith('/'):
info.name += '/'
if not self.allow_dups_from_deps and self._have_added(info.name):
print('Duplicate file in archive: %s, '
'picking first occurrence' % info.name)
return
# Directories with different contents should get merged
# without warnings, warn about duplicate *files* only
elif not self.allow_dups_from_deps and self._have_added(info.name):
print('Duplicate file in archive: %s, '
'picking first occurrence' % info.name)
return

self.tar.addfile(info, fileobj)
self.members.add(info.name)
Expand Down