nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1894160: vendor-python: explicitly add the content of the .egg-info directory; r=ahochheiden

Browse source 
We are about to change the hgignore to remove the lookahead expression. This
means the "*.egg-info/" directories will be ignored everywhere again. To
prevent this causing issue with the vendoring logic, we add a new call to
add-remove explicitly listing file in ".egg-info" directories to override the
ignore pattern.

Once tracked, the ignore pattern will no longer affects these file and all will
be good.

Check the next commit for more information on the motivation.

Differential Revision: https://phabricator.services.mozilla.com/D208968
This commit is contained in:
Pierre-Yves David 2024-05-01 14:54:58 +00:00
parent debf431a77
commit cb9b39fc56
1 changed files with 5 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
python/mozbuild/mozbuild/vendor/vendor_python.py vendored
View file

@ -109,6 +109,11 @@ class VendorPython(MozbuildObject):
_copy_file_strip_carriage_return(lockfiles.pip_lockfile, requirements_out) _copy_file_strip_carriage_return(lockfiles.pip_lockfile, requirements_out)
_copy_file_strip_carriage_return(lockfiles.poetry_lockfile, poetry_lockfile) _copy_file_strip_carriage_return(lockfiles.poetry_lockfile, poetry_lockfile)
self.repository.add_remove_files(vendor_dir) self.repository.add_remove_files(vendor_dir)
# explicitly add the content of the egg-info directory as it is
# covered by the hgignore pattern.
egg_info_files = list(vendor_dir.glob("**/*.egg-info/*"))
if egg_info_files:
self.repository.add_remove_files(*egg_info_files)
def _extract(self, src, dest, keep_extra_files=False): def _extract(self, src, dest, keep_extra_files=False):
"""extract source distribution into vendor directory""" """extract source distribution into vendor directory"""