Skip to content
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

Jump to bottom

Sort RECORD rows only by path and hash, not size #5890

Closed
wants to merge 1 commit into from
Closed

Sort RECORD rows only by path and hash, not size #5890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions news/5868.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix sorting `TypeError` in `move_wheel_files()` when installing packages containing record entries conflicting with generated files.
3 changes: 2 additions & 1 deletion src/pip/_internal/wheel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import csv
import hashlib
import logging
import operator
import os.path
import re
import shutil
Expand Down Expand Up @@ -511,7 +512,7 @@ def _get_script_text(entry):
outrows.append((normpath(f, lib_dir), digest, length))
for f in installed:
outrows.append((installed[f], '', ''))
for row in sorted(outrows):
for row in sorted(outrows, key=operator.itemgetter(0, 1)):
writer.writerow(row)
shutil.move(temp_record, record)

Expand Down