diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_build.py --- a/autobuild/autobuild_tool_build.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_build.py Sun Feb 06 20:25:46 2011 -0500 @@ -60,7 +60,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') parser.add_argument('--no-configure', dest='do_not_configure', default=False, diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_configure.py --- a/autobuild/autobuild_tool_configure.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_configure.py Sun Feb 06 20:25:46 2011 -0500 @@ -51,7 +51,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') parser.add_argument('--configuration', '-c', nargs='?', action="append", dest='configurations', help="build a specific build configuration", metavar='CONFIGURATION') parser.add_argument('--all','-a',dest='all', default=False, action="store_true", diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_edit.py --- a/autobuild/autobuild_tool_edit.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_edit.py Sun Feb 06 20:25:46 2011 -0500 @@ -63,7 +63,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') parser.set_defaults(func=callable.run_cmd) def run(self, args): diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_install.py --- a/autobuild/autobuild_tool_install.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_install.py Sun Feb 06 20:25:46 2011 -0500 @@ -100,7 +100,7 @@ '--config-file', default=configfile.AUTOBUILD_CONFIG_FILE, dest='install_filename', - help='The file used to describe what should be installed.') + help="The file used to describe what should be installed\n (defaults to $AUTOBUILD_CONFIG_FILE or \"autobuild.xml\").") parser.add_argument( '--installed-manifest', default=configfile.INSTALLED_CONFIG_FILE, diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_installables.py --- a/autobuild/autobuild_tool_installables.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_installables.py Sun Feb 06 20:25:46 2011 -0500 @@ -60,7 +60,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') parser.add_argument('-a','--archive', dest='archive', default=None, diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_manifest.py --- a/autobuild/autobuild_tool_manifest.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_manifest.py Sun Feb 06 20:25:46 2011 -0500 @@ -44,7 +44,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') parser.add_argument('--platform','-p', default=get_current_platform(), help="the platform manifest to manipulate") parser.add_argument('command', nargs='?', default='print', diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_package.py --- a/autobuild/autobuild_tool_package.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_package.py Sun Feb 06 20:25:46 2011 -0500 @@ -69,7 +69,7 @@ '--config-file', default=configfile.AUTOBUILD_CONFIG_FILE, dest='autobuild_filename', - help='the file used to describe how to build the package') + help="the file used to describe how to build the package\n (defaults to $AUTOBUILD_CONFIG_FILE or \"autobuild.xml\")") parser.add_argument( '--archive-name', default=None, diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_print.py --- a/autobuild/autobuild_tool_print.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_print.py Sun Feb 06 20:25:46 2011 -0500 @@ -33,7 +33,7 @@ parser.add_argument('--config-file', dest='config_file', default=configfile.AUTOBUILD_CONFIG_FILE, - help="") + help='(defaults to $AUTOBUILD_CONFIG_FILE or "autobuild.xml")') def run(self, args): config = configfile.ConfigurationDescription(args.config_file) diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/autobuild_tool_uninstall.py --- a/autobuild/autobuild_tool_uninstall.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/autobuild_tool_uninstall.py Sun Feb 06 20:25:46 2011 -0500 @@ -70,7 +70,7 @@ '--config-file', default=configfile.AUTOBUILD_CONFIG_FILE, dest='install_filename', - help='The file used to describe what should be installed.') + help="The file used to describe what should be installed\n (defaults to $AUTOBUILD_CONFIG_FILE or \"autobuild.xml\").") parser.add_argument( '--installed-manifest', default=configfile.INSTALLED_CONFIG_FILE, diff -r 9ee2db08d677 -r ff4b1c11908f autobuild/configfile.py --- a/autobuild/configfile.py Thu Feb 03 14:01:59 2011 -0800 +++ b/autobuild/configfile.py Sun Feb 06 20:25:46 2011 -0500 @@ -37,9 +37,11 @@ from common import get_current_platform from llbase import llsd import update +import logging +logger = logging.getLogger('autobuild.configfile') -AUTOBUILD_CONFIG_FILE="autobuild.xml" +AUTOBUILD_CONFIG_FILE=os.environ.get("AUTOBUILD_CONFIG_FILE","autobuild.xml") AUTOBUILD_CONFIG_VERSION="1.2" AUTOBUILD_CONFIG_TYPE="autobuild" INSTALLED_CONFIG_FILE="installed-packages.xml" @@ -201,6 +203,7 @@ for (name, package) in installables.iteritems(): self.installables[name] = PackageDescription(package) self.update(saved_data) + logger.info("Configuration file '%s'" % self.path) else: if saved_data['version'] in update.updaters: update.updaters[saved_data['version']](saved_data, self) @@ -208,7 +211,7 @@ raise ConfigurationError("cannot update version %s file %s" % (saved_data.version, self.path)) elif not os.path.exists(self.path): - pass + logger.warn("Configuration file '%s' not found" % self.path) else: raise ConfigurationError("cannot create configuration file %s" % self.path)