summaryrefslogtreecommitdiffstats
path: root/src/sbin/bcfg2-yum-helper
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-24 13:25:01 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-25 11:58:48 -0400
commit3428eab79ab21d1ecee6d2f8edff083a2cccdf79 (patch)
tree9f19144fe7d5161c9208f50aa0b6a9945682a967 /src/sbin/bcfg2-yum-helper
parent6d4d8df68717780239fad273dd722359db10e64b (diff)
downloadbcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.gz
bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.tar.bz2
bcfg2-3428eab79ab21d1ecee6d2f8edff083a2cccdf79.zip
made json optional again
Diffstat (limited to 'src/sbin/bcfg2-yum-helper')
-rwxr-xr-xsrc/sbin/bcfg2-yum-helper5
1 files changed, 4 insertions, 1 deletions
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