From ccd1635a8032baefbfecc77d1ec89bebe7e83641 Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Tue, 1 Jun 2010 16:47:45 +0000 Subject: [PATCH] Fix to removepackages.py to properly import pkg data from pkgutil database under Snow Leopard when there are items in /Library/Receipts/boms, presumably left over from Leopard. git-svn-id: http://munki.googlecode.com/svn/trunk@541 a4e17f2e-e282-11dd-95e1-755cbddbdd66 --- code/client/munkilib/removepackages.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/client/munkilib/removepackages.py b/code/client/munkilib/removepackages.py index 493087c9..d1f1d9c0 100755 --- a/code/client/munkilib/removepackages.py +++ b/code/client/munkilib/removepackages.py @@ -499,6 +499,7 @@ def initDatabase(packagedb,forcerebuild=False): "Could not remove out-of-date receipt database.") return False + osvers = int(os.uname()[2].split('.')[0]) pkgcount = 0 receiptsdir = "/Library/Receipts" bomsdir = "/Library/Receipts/boms" @@ -512,8 +513,8 @@ def initDatabase(packagedb,forcerebuild=False): for item in bomslist: if item.endswith(".bom"): pkgcount += 1 - else: - #no boms dir in some versions of OS X + if osvers > 9: + # Snow Leopard or later pkglist = [] cmd = ['/usr/sbin/pkgutil', '--pkgs'] p = subprocess.Popen(cmd, shell=False, bufsize=1, @@ -569,8 +570,8 @@ def initDatabase(packagedb,forcerebuild=False): ImportBom(bompath, c) currentpkgindex += 1 local_display_percent_done(currentpkgindex, pkgcount) - else: - #no boms dir in some versions of OS X + if osvers > 9: + # Snow Leopard or later for pkg in pkglist: if munkicommon.stopRequested(): c.close()