commit: b18d15009ba91ce2603f298290fccbe94d519ced Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Jun 5 20:55:20 2021 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Jun 5 20:55:46 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b18d1500
repoman/setup.py: prefer setuptools over distutils (bug 794166) Bug: https://bugs.gentoo.org/794166 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> repoman/setup.py | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/repoman/setup.py b/repoman/setup.py index 8a92ffff6..f8a019b24 100755 --- a/repoman/setup.py +++ b/repoman/setup.py @@ -1,19 +1,33 @@ #!/usr/bin/env python -# Copyright 1998-2020 Gentoo Authors +# Copyright 1998-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from distutils.core import setup, Command -from distutils.command.build import build -from distutils.command.build_scripts import build_scripts -from distutils.command.clean import clean -from distutils.command.install import install -from distutils.command.install_data import install_data -from distutils.command.install_lib import install_lib -from distutils.command.install_scripts import install_scripts -from distutils.command.sdist import sdist -from distutils.dep_util import newer -from distutils.dir_util import mkpath, remove_tree -from distutils.util import change_root, subst_vars +try: + from setuptools.core import setup, Command + from setuptools.command.build import build + from setuptools.command.build_scripts import build_scripts + from setuptools.command.clean import clean + from setuptools.command.install import install + from setuptools.command.install_data import install_data + from setuptools.command.install_lib import install_lib + from setuptools.command.install_scripts import install_scripts + from setuptools.command.sdist import sdist + from setuptools.dep_util import newer + from setuptools.dir_util import mkpath, remove_tree + from setuptools.util import change_root, subst_vars +except ImportError: + from distutils.core import setup, Command + from distutils.command.build import build + from distutils.command.build_scripts import build_scripts + from distutils.command.clean import clean + from distutils.command.install import install + from distutils.command.install_data import install_data + from distutils.command.install_lib import install_lib + from distutils.command.install_scripts import install_scripts + from distutils.command.sdist import sdist + from distutils.dep_util import newer + from distutils.dir_util import mkpath, remove_tree + from distutils.util import change_root, subst_vars import codecs import collections
