openstack
/
bifrost
Code Issues Proposed changes

use sys.exit() replace exit() 

exit() is used for interactive shell, it relies on the site module.
sys.exit() is considered good to use in programs.

Change-Id: I77169ce6bf6e2c778013b1260f68093e95178b7f
This commit is contained in:
caoyue 2016-01-25 17:33:30 +08:00
parent ea5a653064
commit ce3297c46c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bifrost/inventory.py
View File

@ -115,6 +115,7 @@ import csv
import json
import os
import six
import sys
import yaml
from oslo_config import cfg
@ -359,14 +360,14 @@ def main():
if not config.list:
LOG.error("This program must be executed in list mode.")
exit(1)
sys.exit(1)
(groups, hostvars) = _prepare_inventory()
if 'BIFROST_INVENTORY_SOURCE' not in os.environ:
LOG.error('Please define a BIFROST_INVENTORY_SOURCE environment'
'variable with a comma separated list of data sources')
exit(1)
sys.exit(1)
try:
data_source = os.environ['BIFROST_INVENTORY_SOURCE']
@ -389,7 +390,7 @@ def main():
LOG.error("BIFROST_INVENTORY_SOURCE does not define "
"a file that could be processed: "
"Tried JSON, YAML, and CSV formats")
exit(1)
sys.exit(1)
elif "ironic" in data_source:
if SHADE_LOADED:
(groups, hostvars) = _process_shade(groups, hostvars)
@ -397,14 +398,14 @@ def main():
LOG.error("BIFROST_INVENTORY_SOURCE is set to ironic "
"however the shade library failed to load, and may "
"not be present.")
exit(1)
sys.exit(1)
else:
LOG.error('BIFROST_INVENTORY_SOURCE does not define a file')
exit(1)
sys.exit(1)
except Exception as error:
LOG.error('Failed processing: %s' % error)
exit(1)
sys.exit(1)
# General Data Conversion