From 2defc9cf5155f21a988855c31049fad3e40ecdd1 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 29 Jan 2014 07:43:06 -0500
Subject: load correct JSON library on py2.4

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

(limited to 'src/sbin/bcfg2-yum-helper')

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
 
 
-- 
cgit v1.2.3-1-g7c22