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.

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

Add workaround for Fedora's rpm_prefix distribution patch #510

Merged
merged 1 commit into from
Jun 19, 2022

Conversation

cottsay
Copy link
Member

@cottsay cottsay commented May 12, 2022

Similar to what Debian did when Ubuntu Jammy shipped, Fedora has patched CPython to override the installation directory for Python packages, presumably to avoid collision with the system-packaged Python modules.

Fedora's approach is slightly different, but can be patched around in a similar way.

Here's Fedora's patch: https://src.fedoraproject.org/rpms/python3.10/blob/fdfd6c1d945a381cbc85aa6d60b2369ac3ce7f50/f/00251-change-user-install-location.patch

Similar to #504

Similar to what Debian did when Ubuntu Jammy shipped, Fedora has patched
CPython to override the installation directory for Python packages,
presumably to avoid collision with the system-packaged Python modules.

Fedora's approach is slightly different, but can be patched around in a
similar way.
@cottsay cottsay added the bug Something isn't working label May 12, 2022
@cottsay cottsay requested a review from sloretz May 12, 2022 00:44
@cottsay cottsay self-assigned this May 12, 2022
@codecov
Copy link

codecov bot commented May 12, 2022

Codecov Report

Merging #510 (5ea0c5f) into master (8b59ff6) will decrease coverage by 0.04%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master     #510      +/-   ##
==========================================
- Coverage   81.70%   81.66%   -0.05%     
==========================================
  Files          60       60              
  Lines        3564     3566       +2     
  Branches      684      685       +1     
==========================================
  Hits         2912     2912              
- Misses        601      602       +1     
- Partials       51       52       +1     
Impacted Files Coverage Δ
colcon_core/python_install_path.py 60.00% <0.00%> (-15.00%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8b59ff6...5ea0c5f. Read the comment docs.

Copy link
Contributor

@sloretz sloretz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I didn't test locally, but the change looks right given Fedora's patch

@cottsay cottsay merged commit e65ae4d into master Jun 19, 2022
@delete-merged-branch delete-merged-branch bot deleted the cottsay/rpm_prefix branch June 19, 2022 18:26
@cottsay cottsay added this to the 0.8.4 milestone Jun 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Development

Successfully merging this pull request may close these issues.

2 participants