Do not emit a warning about root privileges when --root is used

This commit is contained in:
Lumir Balhar 2020-07-10 08:17:12 +02:00
parent 21fe0a233c
commit 728b4e49d0
2 changed files with 5 additions and 2 deletions

View File

@ -33,7 +33,7 @@ index 70bda2e2..1e750ae1 100644
+ sys.base_prefix != sys.prefix)) + sys.base_prefix != sys.prefix))
+ +
+ # Check whether we have root privileges and aren't in venv/virtualenv + # Check whether we have root privileges and aren't in venv/virtualenv
+ if os.getuid() == 0 and not is_venv(): + if os.getuid() == 0 and not is_venv() and not options.root_path:
+ command = path.basename(sys.argv[0]) + command = path.basename(sys.argv[0])
+ if command == "__main__.py": + if command == "__main__.py":
+ command = path.basename(sys.executable) + " -m pip" + command = path.basename(sys.executable) + " -m pip"

View File

@ -18,7 +18,7 @@ Name: python-%{srcname}
# When updating, update the bundled libraries versions bellow! # When updating, update the bundled libraries versions bellow!
# You can use vendor_meta.sh in the dist git repo # You can use vendor_meta.sh in the dist git repo
Version: %{base_version}%{?prerel:~%{prerel}} Version: %{base_version}%{?prerel:~%{prerel}}
Release: 5%{?dist} Release: 6%{?dist}
Summary: A tool for installing and managing Python packages Summary: A tool for installing and managing Python packages
# We bundle a lot of libraries with pip, which itself is under MIT license. # We bundle a lot of libraries with pip, which itself is under MIT license.
@ -405,6 +405,9 @@ pytest_k='not completion and
%{python_wheeldir}/%{python_wheelname} %{python_wheeldir}/%{python_wheelname}
%changelog %changelog
* Fri Jul 10 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-6
- Do not emit a warning about root privileges when --root is used
* Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-5 * Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-5
- Update bundled provides to match 20.1.1 - Update bundled provides to match 20.1.1