From f65fe9dcf7f63ca7ad25ca13eac7b42e1970d1dd Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 8 Jul 2020 19:42:03 -0400 Subject: Restore default behavior on non-Debian systems. --- distutils/command/install.py | 7 +++++-- distutils/command/install_egg_info.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/distutils/command/install.py b/distutils/command/install.py index 34896f03..889e683d 100644 --- a/distutils/command/install.py +++ b/distutils/command/install.py @@ -14,6 +14,7 @@ from distutils.file_util import write_file from distutils.util import convert_path, subst_vars, change_root from distutils.util import get_platform from distutils.errors import DistutilsOptionError +from distutils._platform import is_debian from site import USER_BASE from site import USER_SITE @@ -206,7 +207,7 @@ class install(Command): # enable custom installation, known values: deb self.install_layout = None - + self.compile = None self.optimize = None @@ -479,11 +480,13 @@ class install(Command): or 'VIRTUAL_ENV' in os.environ or 'real_prefix' in sys.__dict__): self.select_scheme("unix_prefix") - else: + elif is_debian(): if os.path.normpath(self.prefix) == '/usr/local': self.prefix = self.exec_prefix = '/usr' self.install_base = self.install_platbase = '/usr' self.select_scheme("unix_local") + else: + self.select_scheme("unix_prefix") def finalize_other(self): """Finalizes options for non-posix platforms""" diff --git a/distutils/command/install_egg_info.py b/distutils/command/install_egg_info.py index 0a71b610..a9b6067a 100644 --- a/distutils/command/install_egg_info.py +++ b/distutils/command/install_egg_info.py @@ -6,6 +6,7 @@ a package's PKG-INFO metadata.""" from distutils.cmd import Command from distutils import log, dir_util +from distutils._platform import is_debian import os, sys, re class install_egg_info(Command): @@ -34,7 +35,7 @@ class install_egg_info(Command): elif self.prefix_option: no_pyver = False else: - no_pyver = True + no_pyver = is_debian() if no_pyver: basename = "%s-%s.egg-info" % ( to_filename(safe_name(self.distribution.get_name())), -- cgit v1.2.3