Some changes to make removepackages work with the QuarkXPress 8.x packages. These are broken in some subtle way such that under Snow Leopard, they leave receipts in /Library/Receipts/. When trying to remove them, pkgutil by itself does not provide the IFPkgRelocatedPath info we need to find the installed items, so we have to dig into the old-style bundle packages as well.

Also, changing the search order in getpkgkeys() - previously it searched on package names first, and if that failed to turn up anything, it searched on pkgids.  Since normally we have a package id to work with, searching on pkgids first gives us better results. 

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

code/client/munkilib/removepackages.py

@@ -419,6 +419,18 @@ def ImportFromPkgutil(pkgname, c):
         if "install-location" in pl:
             ppath = pl["install-location"]
             ppath = ppath.lstrip('./').rstrip('/')
+        else:
+            # there _should_ be an install-location. If there's not, let's
+            # check the old /Library/Receipts. 
+            # (Workaround for QuarkXPress 8.1 packages)
+            receiptpath = findBundleReceiptFromID(pkgid)
+            if receiptpath:
+                infopath = os.path.join(receiptpath, 'Contents/Info.plist')
+                if os.path.exists(infopath):
+                    infopl = FoundationPlist.readPlist(infopath)
+                    if "IFPkgRelocatedPath" in infopl:
+                        ppath = infopl["IFPkgRelocatedPath"]
+                        ppath = ppath.lstrip('./').rstrip('/')
         if "pkg-version" in pl:
             vers = pl["pkg-version"]
         if "install-time" in pl:
@@ -507,11 +519,12 @@ def initDatabase(packagedb,forcerebuild=False):
         p = subprocess.Popen(cmd, shell=False, bufsize=1, 
                              stdin=subprocess.PIPE,
                              stdout=subprocess.PIPE, 
-                             stderr=subprocess.STDOUT)
+                             stderr=subprocess.PIPE)
         while True: 
             line =  p.stdout.readline()
             if not line and (p.poll() != None):
                 break
+            
             pkglist.append(line.rstrip('\n'))
             pkgcount += 1
             
@@ -595,11 +608,15 @@ def getpkgkeys(pkgnames):
     pkgkeyslist = []
     for pkg in pkgnames:
         t = (pkg, )
-        pkg_keys = c.execute('select pkg_key from pkgs where pkgname = ?',
+        munkicommon.display_debug1(
+                    "select pkg_key from pkgs where pkgid = %s" % pkg)
+        pkg_keys = c.execute('select pkg_key from pkgs where pkgid = ?',
                              t).fetchall()
         if not pkg_keys:
-            # try pkgid
-            pkg_keys = c.execute('select pkg_key from pkgs where pkgid = ?',
+            # try pkgname
+            munkicommon.display_debug1(
+                        "select pkg_key from pkgs where pkgname = %s" % pkg)
+            pkg_keys = c.execute('select pkg_key from pkgs where pkgname = ?',
                                  t).fetchall()
         if not pkg_keys:
             munkicommon.display_error("%s not found in database." % pkg)
@@ -612,6 +629,7 @@ def getpkgkeys(pkgnames):
         pkgkeyslist = []
     c.close
     conn.close
+    munkicommon.display_debug1("pkgkeys: %s" % pkgkeyslist)
     return pkgkeyslist
 
 
@@ -665,6 +683,7 @@ def getpathstoremove(pkgkeylist):
     removalpaths = []
     for item in results:
         removalpaths.append(item[0])
+        
     return removalpaths