Update ohai module to run on older python clients.

2012-02-24 02:05:49 -05:00 · 2012-02-24 02:05:49 -05:00 · 9e931f323c
parent f17c4ca4b2
commit 9e931f323c
1 changed files with 5 additions and 1 deletions
--- a/library/ohai
+++ b/library/ohai
@ -2,7 +2,11 @@

 # requires 'ohai' to be installed

-import json
+try:
+   import json
+except ImportError:
+   import simplejson as json
+
 import subprocess

 cmd = subprocess.Popen("/usr/bin/ohai", stdout=subprocess.PIPE, stderr=subprocess.PIPE)