Have downloads always end up under WORKING_DIRECTORY #5913
Conversation
pulpcore/download/base.py
Outdated
| work_dir = str(settings.WORKING_DIRECTORY) | ||
| self._writer = tempfile.NamedTemporaryFile( | ||
| dir="." if work_dir in os.getcwd() else work_dir, | ||
| suffix=suffix, | ||
| delete=False, | ||
| ) |
There was a problem hiding this comment.
It appears like this is a better variant of what I was trying to do in the past: pulp/pulp_container#1299 (comment).
There was a problem hiding this comment.
Yeah, I'm doing something similar with my new work on pull-through caching in pulp-python and I thought I should just move the fix into pulpcore.
There was a problem hiding this comment.
Hmm this feels like patching over a deeper issue. But well.
I think we should leave a comment on why this is important and the assumptions that lead to there.
pulpcore/download/base.py
Outdated
| work_dir = str(settings.WORKING_DIRECTORY) | ||
| self._writer = tempfile.NamedTemporaryFile( | ||
| dir="." if work_dir in os.getcwd() else work_dir, | ||
| suffix=suffix, | ||
| delete=False, | ||
| ) |
There was a problem hiding this comment.
Hmm this feels like patching over a deeper issue. But well.
I think we should leave a comment on why this is important and the assumptions that lead to there.
pulpcore/download/base.py
Outdated
| self._writer = tempfile.NamedTemporaryFile(dir=".", suffix=suffix, delete=False) | ||
| work_dir = str(settings.WORKING_DIRECTORY) | ||
| self._writer = tempfile.NamedTemporaryFile( | ||
| dir="." if work_dir in os.getcwd() else work_dir, |
There was a problem hiding this comment.
This is a simple string comparison. So at least it should be os.getcwd().startswith(work_dir). But i think i'd prefer using pathlib at this point.
There was a problem hiding this comment.
Ok, updated to use pathlib logic and added a simple comment for the check.
gerrod3
force-pushed
the
downloader-dir
branch
from
5aa97ce to
1253603
Compare
Backport to 3.49: 💚 backport PR created✅ Backport PR branch: Backported as #5926 🤖 @patchback |
fixes: #5912