Commit 9e931f32 by Michael DeHaan

Update ohai module to run on older python clients.

parent f17c4ca4
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
# requires 'ohai' to be installed # requires 'ohai' to be installed
import json try:
import json
except ImportError:
import simplejson as json
import subprocess import subprocess
cmd = subprocess.Popen("/usr/bin/ohai", stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen("/usr/bin/ohai", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment