From 9e931f323c716b8caef817f85653291f126de6a5 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Fri, 24 Feb 2012 02:05:49 -0500
Subject: [PATCH] Update ohai module to run on older python clients.

---
 library/ohai | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/ohai b/library/ohai
index 968c047236..7aefd06501 100644
--- 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)