openstack
/
oslo-incubator
Code Issues Proposed changes

Merge "Ensure options passed to update.py are sane"

This commit is contained in:
Jenkins 2014-06-16 19:34:43 +00:00 committed by Gerrit Code Review
parent ec77742f26 79c5dff278
commit 45890dae35
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
update.py
View File

@ -125,7 +125,14 @@ def _parse_args(argv):
config_file = def_config_file(conf.configfile_or_destdir)
if config_file:
conf(argv + ['--config-file', config_file])
if not (conf.module or conf.modules):
conf(argv + ['--config-file', config_file])
elif os.path.isdir(conf.configfile_or_destdir):
conf(argv + ['--dest-dir', conf.configfile_or_destdir])
else:
print('Specifying a config file and a list of modules to '
'sync will not work correctly', file=sys.stderr)
sys.exit(1)
return conf