]> granicus.if.org Git - python/commitdiff
Patch from Rene Liebscher:
authorGreg Ward <gward@python.net>
Wed, 7 Jun 2000 02:26:19 +0000 (02:26 +0000)
committerGreg Ward <gward@python.net>
Wed, 7 Jun 2000 02:26:19 +0000 (02:26 +0000)
Look for personal config file in /home/greg on Windows, too: users will have
to set /home/greg to use this, so it's not something that many people will
use.  But if python-dev comes up with the "right way" to divine a
home directory on Windows, we can use that to set /home/greg and poof! --
personal Distutils config files on Windows.

Lib/distutils/dist.py

index 44f5c8806ad5daceea391ccf25031b1a70442ce1..ea4ec2e7e9a09cca49891029a2f8742d79904b7d 100644 (file)
@@ -263,24 +263,25 @@ class Distribution:
         and setup.cfg in the current directory.
         """
         files = []
-        if os.name == "posix":
-            check_environ()
-
-            sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
-            sys_file = os.path.join(sys_dir, "pydistutils.cfg")
-            if os.path.isfile(sys_file):
-                files.append(sys_file)
-
-            user_file = os.path.join(os.environ.get('HOME'),
-                                     ".pydistutils.cfg")
+        check_environ()
+
+        if os.name=='posix':
+           sys_dir = os.path.dirname(sys.modules['distutils'].__file__)
+           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)
+
+       if os.environ.has_key('HOME'):
+           user_file = os.path.join(os.environ.get('HOME'),
+                                     user_filename)
             if os.path.isfile(user_file):
                 files.append(user_file)
 
-        else:
-            sys_file = os.path.join (sysconfig.PREFIX, "pydistutils.cfg")
-            if os.path.isfile(sys_file):
-                files.append(sys_file)
-
         # All platforms support local setup.cfg
         local_file = "setup.cfg"
         if os.path.isfile(local_file):