cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2367 from bcoca/catch_mismatched_json

Browse source 
now cleanly catches traceback when conflicting versions of simplejson and python are installed
This commit is contained in:
Michael DeHaan 2013-03-11 15:26:01 -07:00
commit e241bb5801
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/module_common.py
View file

@ -75,6 +75,9 @@ except ImportError:
except ImportError: except ImportError:
sys.stderr.write('Error: ansible requires a json module, none found!') sys.stderr.write('Error: ansible requires a json module, none found!')
sys.exit(1) sys.exit(1)
except SyntaxError:
sys.stderr.write('SyntaxError: probably due to json and python being for different versions')
sys.exit(1)
HAVE_SELINUX=False HAVE_SELINUX=False
try: try: