Merge branch 'master' of https://code.google.com/p/munki

code/client/munkilib/appleupdates.py

@@ -53,6 +53,7 @@ DEFAULT_CATALOG_URLS = {
     '10.5': 'http://swscan.apple.com/content/catalogs/others/index-leopard.merged-1.sucatalog',
     '10.6': 'http://swscan.apple.com/content/catalogs/others/index-leopard-snowleopard.merged-1.sucatalog',
     '10.7': 'http://swscan.apple.com/content/catalogs/others/index-lion-snowleopard-leopard.merged-1.sucatalog.gz',
+    '10.8': 'http://swscan.apple.com/content/catalogs/others/index-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog.gz'
 }
 
 # Preference domain for Apple Software Update.

code/client/munkilib/munkicommon.py

@@ -478,7 +478,7 @@ def validateDateFormat(datetime_string):
 def log(msg, logname=''):
     """Generic logging function"""
     # date/time format string
-    formatstr = '%b %d %H:%M:%S'
+    formatstr = '%b %d %Y %H:%M:%S %z'
     if not logname:
         # use our regular logfile
         logpath = pref('LogFile')
@@ -549,7 +549,7 @@ def saveappdata():
     except FoundationPlist.NSPropertyListSerializationException, err:
         munkicommon.display_warning(
             'Unable to save inventory report: %s' % err)
-        
+
 
 
 def printreportitem(label, value, indent=0):