Skip to content

fix(forklift): Distinguish deleted project filename error (#18671) #18925

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

Merged
merged 9 commits into from
Oct 23, 2025
Merged

fix(forklift): Distinguish deleted project filename error (#18671) #18925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7146c07
feat(forklift): Distinguish error for archived project file conflicts
Delta17920 Oct 23, 2025
8bd0e28
Merge branch 'main' into fix-18671-deleted-project-error
Delta17920 Oct 23, 2025
ff5f0d2
lint formatted
Delta17920 Oct 23, 2025
db4dc09
style: Apply formatting and remove unused imports
Delta17920 Oct 23, 2025
8046a6b
Merge branch 'fix-18671-deleted-project-error' of https://github.com/…
Delta17920 Oct 23, 2025
69c9b9f
rollback
Delta17920 Oct 23, 2025
e078c8c
edited
Delta17920 Oct 23, 2025
4711df5
Reword slightly
di Oct 23, 2025
22f7cfb
Merge branch 'main' into fix-18671-deleted-project-error
di Oct 23, 2025
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
5 changes: 2 additions & 3 deletions tests/unit/forklift/test_legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2146,9 +2146,8 @@ def test_upload_fails_with_previously_used_filename(
assert db_request.help_url.calls == [pretend.call(_anchor="file-name-reuse")]
assert resp.status_code == 400
assert resp.status == (
"400 This filename has already been used, use a "
"different version. "
"See /the/help/url/ for more information."
"400 This filename was previously used by a file that has since been "
"deleted. Use a different version. See /the/help/url/ for more information."
)

def test_upload_noop_with_existing_filename_same_content(
Expand Down
5 changes: 2 additions & 3 deletions warehouse/forklift/legacy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,8 @@ def file_upload(request):
)
raise _exc_with_message(
HTTPBadRequest,
"This filename has already been used, use a "
"different version. "
"See "
"This filename was previously used by a file that has since been "
"deleted. Use a different version. See "
+ request.help_url(_anchor="file-name-reuse")
+ " for more information.",
)
Expand Down