summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-29 07:43:06 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-01-29 16:34:18 -0500
commit2defc9cf5155f21a988855c31049fad3e40ecdd1 (patch)
treef84db01dae7eb23a8d34a4022a80e00f39b104d7 /src/sbin
parent79f5fce2a387f5dfc13e10146b36cb620a5bf166 (diff)
downloadbcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.tar.gz
bcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.tar.bz2
bcfg2-2defc9cf5155f21a988855c31049fad3e40ecdd1.zip
load correct JSON library on py2.4
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-yum-helper3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper
index 49baeb9c3..132f9efce 100755
--- a/src/sbin/bcfg2-yum-helper
+++ b/src/sbin/bcfg2-yum-helper
@@ -15,7 +15,8 @@ from lockfile import FileLock, LockTimeout
from optparse import OptionParser
try:
import json
-except ImportError:
+ json.loads # py2.4 json library is structured differently
+except (ImportError, AttributeError):
import simplejson as json