Skip to content

Commit d029959

Browse files
Delta17920di
andauthored
fix(forklift): Distinguish deleted project filename error (#18671) (#18925)
* feat(forklift): Distinguish error for archived project file conflicts Update upload validation to check project lifecycle_status for file conflicts. Provides a more specific error message when the conflict is with an archived project. Fixes #18671 * lint formatted * style: Apply formatting and remove unused imports * rollback * edited * Reword slightly --------- Co-authored-by: Dustin Ingram <[email protected]>
1 parent 06bb17e commit d029959

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

tests/unit/forklift/test_legacy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2146,9 +2146,8 @@ def test_upload_fails_with_previously_used_filename(
21462146
assert db_request.help_url.calls == [pretend.call(_anchor="file-name-reuse")]
21472147
assert resp.status_code == 400
21482148
assert resp.status == (
2149-
"400 This filename has already been used, use a "
2150-
"different version. "
2151-
"See /the/help/url/ for more information."
2149+
"400 This filename was previously used by a file that has since been "
2150+
"deleted. Use a different version. See /the/help/url/ for more information."
21522151
)
21532152

21542153
def test_upload_noop_with_existing_filename_same_content(

warehouse/forklift/legacy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,9 +1147,8 @@ def file_upload(request):
11471147
)
11481148
raise _exc_with_message(
11491149
HTTPBadRequest,
1150-
"This filename has already been used, use a "
1151-
"different version. "
1152-
"See "
1150+
"This filename was previously used by a file that has since been "
1151+
"deleted. Use a different version. See "
11531152
+ request.help_url(_anchor="file-name-reuse")
11541153
+ " for more information.",
11551154
)

0 commit comments

Comments
 (0)