A mistaken bit got committed along with the other utils stuff I sent
in last week:

index 87cd079..31c08ba 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -1958,10 +1958,8 @@ def get_shared_secret():
 def local_get_cobbler_api_url():
     # Load server and http port
     try:
-        #fh = open("/etc/cobbler/settings")
-        fh = open("/etc/cobbler/settings.json")
-        #data = yaml.load(fh.read())
-        data = simplejson.load(fh)
+        fh = open("/etc/cobbler/settings")
+        data = yaml.load(fh.read())
         fh.close()
     except:
        traceback.print_exc()
_______________________________________________
cobbler-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/cobbler-devel

Reply via email to