Revert "Add --executable option to install.py command"

This enhancement is currently not needed and it can possibly
collide with `pip --editable`option

Reverts commit 8043ae7719.
This commit is contained in:
Michal Cyprian 2017-08-09 13:49:30 +02:00
parent f9d5f4b78d
commit d99160d4df
2 changed files with 6 additions and 53 deletions

View File

@ -1,45 +0,0 @@
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py
index c89d5ef..dd61621 100644
--- a/Lib/distutils/cmd.py
+++ b/Lib/distutils/cmd.py
@@ -296,7 +296,8 @@ class Command:
finalized command object.
"""
cmd_obj = self.distribution.get_command_obj(command, create)
- cmd_obj.ensure_finalized()
+ if cmd_obj is not None:
+ cmd_obj.ensure_finalized()
return cmd_obj
# XXX rename to 'get_reinitialized_command()'? (should do the
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 8174192..30ca739 100644
--- a/Lib/distutils/command/install.py
+++ b/Lib/distutils/command/install.py
@@ -122,6 +122,8 @@ class install(Command):
"force installation (overwrite any existing files)"),
('skip-build', None,
"skip rebuilding everything (for testing/debugging)"),
+ ('executable=', 'e',
+ "specify final destination interpreter path (install.py)"),
# Where to install documentation (eventually!)
#('doc-format=', None, "format of documentation to generate"),
@@ -194,6 +196,7 @@ class install(Command):
# directory not in sys.path.
self.force = 0
self.skip_build = 0
+ self.executable = None
self.warn_dir = 1
# These are only here as a conduit from the 'build' command to the
@@ -365,6 +368,9 @@ class install(Command):
('build_base', 'build_base'),
('build_lib', 'build_lib'))
+ if self.executable is None:
+ self.executable = os.path.normpath(sys.executable)
+
# Punt on doc directories for now -- after all, we're punting on
# documentation completely!

View File

@ -104,7 +104,7 @@ Summary: An interpreted, interactive, object-oriented programming language
Name: %{python}
# Remember to also rebase python-docs when changing this:
Version: 2.7.13
Release: 14%{?dist}
Release: 15%{?dist}
License: Python
Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@ -751,12 +751,6 @@ Patch198: 00198-add-rewheel-module.patch
# Fixed upstream: https://hg.python.org/cpython/rev/13a39142c047
Patch250: 00250-getentropy.patch
# 00252
# Add executable option to install.py command to make it work for
# scripts specified as an entry_points
# Reported upstream: https://bugs.python.org/issue29411
Patch252: 00252-add-executable-option.patch
# 00269 #
# Fix python's recompilation with common build commands when using
# profile guided optimizations.
@ -1082,7 +1076,6 @@ mv Modules/cryptmodule.c Modules/_cryptmodule.c
%endif
%patch250 -p1
%patch252 -p1
%patch269 -p1
%patch270 -p1
@ -1959,6 +1952,11 @@ rm -fr %{buildroot}
# ======================================================
%changelog
* Wed Aug 09 2017 Michal Cyprian <mcyprian@redhat.com> - 2.7.13-15
- Revert "Add --executable option to install.py command"
This enhancement is currently not needed and it can possibly
collide with `pip --editable`option
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.13-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild