0

renamed --config-file to --settings, updated README with new options

This commit is contained in:
Aaron Griffith
2011-05-13 18:22:00 -04:00
parent dacd45e5d3
commit 21de6222ca
2 changed files with 23 additions and 4 deletions

View File

@@ -24,7 +24,7 @@ class ConfigOptionParser(object):
self.requiredArgs = []
# add the *very* special config-file path option
self.add_option("--config-file", dest="config_file", help="Specifies a configuration file to load, by name. This file's format is discussed in the README.", metavar="PATH", type="string", commandLineOnly=True)
self.add_option("--settings", dest="config_file", help="Specifies a settings file to load, by name. This file's format is discussed in the README.", metavar="PATH", type="string", commandLineOnly=True)
def display_config(self):
logging.info("Using the following settings:")
@@ -77,7 +77,7 @@ class ConfigOptionParser(object):
self.configFile = options.config_file
elif os.path.exists(self.configFile):
# warn about automatic loading
logging.warning("Automatic settings.py loading is DEPRECATED, and may be removed in the future. Please use --config-file instead.")
logging.warning("Automatic settings.py loading is DEPRECATED, and may be removed in the future. Please use --settings instead.")
if os.path.exists(self.configFile):
execfile(self.configFile, g, l)