More removepackages reorganization

code/client/munkilib/installer/core.py

@@ -33,6 +33,7 @@ from Foundation import NSDate
 
 from . import dmg
 from . import pkg
+from . import rmpkgs
 
 from .. import adobeutils
 from .. import display
@@ -50,8 +51,6 @@ from .. import scriptutils
 from .. import FoundationPlist
 
 from ..updatecheck import catalogs
-from ..removepkgslib import removepackages
-
 
 # initialize our report fields
 # we do this here because appleupdates.installAppleUpdates()
@@ -524,8 +523,8 @@ def process_removals(removallist, only_unattended=False):
                 if 'packages' in item:
                     if item.get('RestartAction') == "RequireRestart":
                         restart_flag = True
-                    retcode = removepackages(item['packages'],
-                                             forcedeletebundles=True)
+                    retcode = rmpkgs.removepackages(item['packages'],
+                                                    forcedeletebundles=True)
                     if retcode:
                         if retcode == -128:
                             message = ("Uninstall of %s was "

code/client/munkilib/installer/rmpkgs.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 
 """
-removepkgslib
+installer.rmpkgs
 
 Code to analyze installed packages and remove
 files unique to the packages given. No attempt
@@ -29,13 +29,13 @@ import os
 import subprocess
 import sqlite3
 
-from . import display
-from . import munkistatus
-from . import osutils
-from . import pkgutils
-from . import prefs
-from . import processes
-from . import FoundationPlist
+from .. import display
+from .. import munkistatus
+from .. import osutils
+from .. import pkgutils
+from .. import prefs
+from .. import processes
+from .. import FoundationPlist
 
 
 #################################################################

code/client/removepackages

@@ -33,7 +33,7 @@ import sys
 
 from munkilib import display
 from munkilib import munkistatus
-from munkilib import removepkgslib
+from munkilib.installer import rmpkgs
 
 
 def main():
@@ -78,7 +78,7 @@ def main():
         munkistatus.message("Removing %s packages..." % pkgcount)
         munkistatus.detail("")
 
-    retcode = removepkgslib.removepackages(
+    retcode = rmpkgs.removepackages(
         pkgnames,
         forcedeletebundles=options.forcedeletebundles,
         listfiles=options.listfiles,