commit: f5ae3c4b198f0d5543afbdd36d923422cd451272 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jun 6 18:15:36 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Jun 14 19:21:55 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f5ae3c4b
fetch: do not rely on os.stat() for DISTDIR write test If DISTDIR is an automount, os.stat() will not trigger it. Just try to create a file instead. Bug: https://bugs.gentoo.org/485100 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> lib/portage/package/ebuild/fetch.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py index 0d30cb88e..0ecad162e 100644 --- a/lib/portage/package/ebuild/fetch.py +++ b/lib/portage/package/ebuild/fetch.py @@ -240,20 +240,15 @@ def _ensure_distdir(settings, distdir): userpriv = portage.data.secpass >= 2 and "userpriv" in settings.features write_test_file = os.path.join(distdir, ".__portage_test_write__") - try: - st = os.stat(distdir) - except OSError: - st = None - - if st is not None and stat.S_ISDIR(st.st_mode): - if not (userfetch or userpriv): - return - if _userpriv_test_write_file(settings, write_test_file): - return + if _userpriv_test_write_file(settings, write_test_file): + return _userpriv_test_write_file_cache.pop(write_test_file, None) + + already_exists = os.path.isdir(distdir) + if ensure_dirs(distdir, gid=dir_gid, mode=dirmode, mask=modemask): - if st is None: + if not already_exists: # The directory has just been created # and therefore it must be empty. return
