Reverted to using plistlib.readPlist() in getCatalogs() because the Foundation call used by munkicommon.readPlist() assumes the top-level object is a dictionary. The top-level object in catalogs is an array.

git-svn-id: http://munki.googlecode.com/svn/trunk@151 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2026-04-22 20:48:36 -05:00 · 2009-07-31 16:37:47 +00:00
parent 423c31340d
commit a27cf9dc35
1 changed files with 3 additions and 1 deletions
@@ -1294,7 +1294,9 @@ def getCatalogs(cataloglist):
            message = "Retreiving catalog '%s'..." % catalogname
            (newcatalog, err) = getHTTPfileIfNewerAtomically(catalogurl, catalogpath, message=message)
            if newcatalog:
-                catalog[catalogname] = makeCatalogDB(munkicommon.readPlist(newcatalog))
+                # can't use munkicommon.readPlist here because it doesn't deal with plists
+                # that aren't dictionaries. Our catalog plists are arrays.
+                catalog[catalogname] = makeCatalogDB(plistlib.readPlist(newcatalog))
            else:
                munkicommon.display_error("Could not retreive catalog %s from server." % catalog)
                munkicommon.display_error(err)