git-svn-id: http://munki.googlecode.com/svn/trunk@327 a4e17f2e-e282-11dd-95e1-755cbddbdd66

code/client/munkilib/munkicommon.py

@@ -298,7 +298,7 @@ def archive_report():
             archiveitems = [item for item in output.splitlines() if item.startswith("ManagedInstallReport-")]
             if len(archiveitems) > 100:
                 for item in archiveitems[100:]:
-                    itempath = os.path.join(archivepath, archiveitem)
+                    itempath = os.path.join(archivepath, item)
                     if os.path.isfile(itempath):
                         try:
                             os.unlink(itempath)

code/client/munkilib/removepackages.py

@@ -78,7 +78,8 @@ import FoundationPlist
 #                      taint VARCHAR NOT NULL);
 #################################################################
 #################################################################
-# our package db schema -- a subset of Apple's
+# our package db schema -- a subset of Apple's, but sufficient
+#                          for our needs:
 #
 # CREATE TABLE paths (path_key INTEGER PRIMARY KEY AUTOINCREMENT,
 #                     path VARCHAR NOT NULL UNIQUE )
@@ -942,6 +943,7 @@ def main():
     if options.munkistatusoutput:
         pkgcount = len(pkgnames)
         munkistatus.message("Removing %s packages..." % pkgcount)
+        munkistatus.detail("")
         
     retcode = removepackages(pkgnames, forcedeletebundles=options.forcedeletebundles, listfiles=options.listfiles, 
                     rebuildpkgdb=options.rebuildpkgdb, noremovereceipts=options.noremovereceipts,

code/client/munkilib/updatecheck.py

@@ -1075,7 +1075,7 @@ def processManifestForInstalls(manifestpath, installinfo, parentcatalogs=[]):
     cataloglist = getManifestValueForKey(manifestpath, 'catalogs')
     if cataloglist:
         getCatalogs(cataloglist)
-    else:
+    elif parentcatalogs:
         cataloglist = parentcatalogs
     
     if cataloglist:
@@ -1348,7 +1348,7 @@ def processManifestForRemovals(manifestpath, installinfo, parentcatalogs=[]):
     cataloglist = getManifestValueForKey(manifestpath, 'catalogs')
     if cataloglist:
         getCatalogs(cataloglist)
-    else:
+    elif parentcatalogs:
         cataloglist = parentcatalogs
         
     if cataloglist:
@@ -1764,6 +1764,7 @@ def check(id=''):
     if munkicommon.munkistatusoutput:
         munkistatus.activate()
         munkistatus.message("Checking for available updates...")
+        munkistatus.detail("")
         munkistatus.percent("-1")
         
     munkicommon.log("### Beginning managed software check ###")