More print statement cleanup.

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

code/client/munkilib/adobeutils.py

@@ -48,7 +48,7 @@ def mountAdobeDmg(dmgpath):
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (pliststr, err) = proc.communicate()
     if err:
-        print >> sys.stderr, "Error %s mounting %s." % (err, dmgname)
+        munkicommon.display_error("Error %s mounting %s." % (err, dmgname))
     if pliststr:
         plist = FoundationPlist.readPlistFromString(pliststr)
         for entity in plist['system-entities']:

code/client/munkilib/removepackages.py

@@ -775,8 +775,8 @@ def removeReceipts(pkgkeylist, noupdateapplepkgdb):
                                             ["/bin/rm", "-rf", receiptpath])
             
         # remove pkg info from our database
-        if munkicommon.verbose > 1:
-            print "Removing package data from internal database..."
+        munkicommon.display_detail(
+            "Removing package data from internal database...")
         curs.execute('DELETE FROM pkgs_paths where pkg_key = ?', pkgkey_t)
         curs.execute('DELETE FROM pkgs where pkg_key = ?', pkgkey_t)
         
@@ -815,9 +815,9 @@ def removeReceipts(pkgkeylist, noupdateapplepkgdb):
                                         stdout=subprocess.PIPE,
                                         stderr=subprocess.PIPE)
                 (output, unused_err) = proc.communicate()
-                if munkicommon.verbose > 1:
-                    if output: 
-                        print str(output).decode('UTF-8').rstrip('\n')
+                if output: 
+                    munkicommon.display_detail(
+                        str(output).decode('UTF-8').rstrip('\n'))
                     
     local_display_percent_done(2, 4)