From 1169687692e5e897033421fe6a73a3c32675a7d7 Mon Sep 17 00:00:00 2001 From: Greg Ward Date: Wed, 7 Jun 2000 02:29:03 +0000 Subject: [PATCH] Always look for the system config file in the Distutils module directory, and call it "distutils.cfg" instead of "pydistutils.cfg" (personal config files are still ".pydistutils.cfg" or "pydistutils.cfg", though). --- Lib/distutils/dist.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py index ea4ec2e7e9..0b8a99e1cd 100644 --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -265,20 +265,23 @@ class Distribution: files = [] check_environ() - if os.name=='posix': - sys_dir = os.path.dirname(sys.modules['distutils'].__file__) + # Where to look for the system-wide Distutils config file + sys_dir = os.path.dirname(sys.modules['distutils'].__file__) + + # Look for the system config file + sys_file = os.path.join(sys_dir, "distutils.cfg") + if os.path.isfile(sys_file): + files.append(sys_file) + + # What to call the per-user config file + if os.name == 'posix': user_filename = ".pydistutils.cfg" else: - sys_dir = sysconfig.PREFIX user_filename = "pydistutils.cfg" - sys_file = os.path.join(sys_dir, "pydistutils.cfg") - if os.path.isfile(sys_file): - files.append(sys_file) - + # And look for the user config file if os.environ.has_key('HOME'): - user_file = os.path.join(os.environ.get('HOME'), - user_filename) + user_file = os.path.join(os.environ.get('HOME'), user_filename) if os.path.isfile(user_file): files.append(user_file) -- 2.40.0