f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv--- Lib/distutils/dist.py.orig 2008-09-03 05:13:56.000000000 -0600
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+++ Lib/distutils/dist.py 2008-10-03 18:33:47.000000000 -0600
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv@@ -60,6 +60,7 @@
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv ('quiet', 'q', "run quietly (turns verbosity off)"),
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv ('dry-run', 'n', "don't actually do anything"),
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv ('help', 'h', "show detailed help message"),
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv # 'common_usage' is a short (2-3 line) string describing the common
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv@@ -267,6 +268,12 @@
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ # no-user-cfg is handled before other command line args
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ # because other args override the config files, and this
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ # one is needed before we can load the config files.
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ # If attrs['script_args'] wasn't passed, assume false.
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv # __init__ ()
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv@@ -327,6 +334,9 @@
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv Distutils __inst__.py file lives), a file in the user's home
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv directory named .pydistutils.cfg on Unix and pydistutils.cfg
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv on Windows/Mac, and setup.cfg in the current directory.
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ The file in the user's home directory can be disabled with the
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ --no-user-cfg option.
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv files = []
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv check_environ()
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv@@ -347,7 +357,7 @@
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv # And look for the user config file
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv user_file = os.path.join(os.path.expanduser('~'), user_filename)
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv- if os.path.isfile(user_file):
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv # All platforms support local setup.cfg
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv@@ -355,6 +365,8 @@
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv if os.path.isfile(local_file):
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ if DEBUG:
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv+ print "using config files: %s" % ', '.join(files)
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv return files
f7b499d11542a2d5f93ba2d3c7c268e6d6d045bb~suv # find_config_files ()