Remove distutils which are deprecated in python3.10 (RhBug:1950229)
https://bugzilla.redhat.com/show_bug.cgi?id=1950229
This commit is contained in:
parent
7d0284f341
commit
18995d6508
|
@ -19,7 +19,7 @@ ELSE ()
|
|||
MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED})
|
||||
ENDIF()
|
||||
|
||||
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
|
||||
|
||||
ADD_SUBDIRECTORY (dnf)
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import distutils.sysconfig
|
||||
import sysconfig
|
||||
|
||||
CONF_FILENAME='/etc/dnf/dnf.conf' # :api
|
||||
CONF_AUTOMATIC_FILENAME='/etc/dnf/automatic.conf'
|
||||
|
@ -50,7 +50,7 @@ VERBOSE_LEVEL=6
|
|||
PREFIX=NAME.lower()
|
||||
PROGRAM_NAME=NAME.lower() # Deprecated - no longer used, Argparser prints program name based on sys.argv
|
||||
PLUGINCONFPATH = '/etc/dnf/plugins' # :api
|
||||
PLUGINPATH = '%s/dnf-plugins' % distutils.sysconfig.get_python_lib()
|
||||
PLUGINPATH = '%s/dnf-plugins' % sysconfig.get_path('purelib')
|
||||
VERSION='@DNF_VERSION@'
|
||||
USER_AGENT = "dnf/%s" % VERSION
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
from __future__ import absolute_import
|
||||
from __future__ import unicode_literals
|
||||
from dnf.i18n import _
|
||||
import distutils.version
|
||||
import dnf.util
|
||||
import errno
|
||||
import fnmatch
|
||||
|
|
Loading…
Reference in New Issue