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

Fix: No traceback when Python interpreter is running with -P, allow -P in shebang lines #2089

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Fix: No traceback when Python interpreter is running with -P, allow -P in shebang lines #2089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9799ce
Fix: No traceback when Python interpreter is running with -P
jrohel Apr 26, 2024
c9da8e6
Allow `%py3_shebang_fix` macro to add `-P` argument to shebang lines
jrohel Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions bin/dnf-automatic.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ if here == '/usr/bin':
# we never import Python modules from /usr/bin
# removing this lowers the risk of accidental imports of weird files
del sys.path[0]
else:
# git checkout
dnf_toplevel = os.path.dirname(here)
sys.path[0] = dnf_toplevel

import dnf.automatic.main
sys.exit(dnf.automatic.main.main(sys.argv[1:]))
5 changes: 0 additions & 5 deletions bin/dnf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ if here == '/usr/bin':
# we never import Python modules from /usr/bin
# removing this lowers the risk of accidental imports of weird files
del sys.path[0]
else:
# git checkout
import os
dnf_toplevel = os.path.dirname(here)
sys.path[0] = dnf_toplevel

from dnf.cli import main
main.user_main(sys.argv[1:], exit_code=True)
4 changes: 0 additions & 4 deletions dnf.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,6 @@ rm %{buildroot}%{_mandir}/man5/%{name}.conf.5*
%endif

%if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
# Don't add -P to Python shebangs
# The executable Python scripts import each other
%undefine _py3_shebang_P

%py3_shebang_fix %{buildroot}%{_bindir}/dnf-3
%py3_shebang_fix %{buildroot}%{_bindir}/dnf-automatic
%py3_shebang_fix %{buildroot}%{python3_sitelib}/%{name}/cli/completion_helper.py
Expand Down