From 3428eab79ab21d1ecee6d2f8edff083a2cccdf79 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 24 Sep 2012 13:25:01 -0400
Subject: made json optional again

---
 src/sbin/bcfg2-yum-helper | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/sbin')

diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index 07f9b81b0..859ec36b6 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -10,7 +10,10 @@ import sys
 import yum
 import logging
 from optparse import OptionParser
-from Bcfg2.Compat import json
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 LOGGER = None
 
-- 
cgit v1.2.3-1-g7c22