Changing hash verification warnings a bit per Greg's request.

git-svn-id: http://munki.googlecode.com/svn/branches/pkg-hash-verification@710 a4e17f2e-e282-11dd-95e1-755cbddbdd66

code/client/munkilib/updatecheck.py

@@ -1039,9 +1039,6 @@ def verifySoftwarePackageIntegrity(manifestitem, file_path, item_pl, item_key):
     '''
     mode = munkicommon.pref('PackageVerificationMode')
     if not mode:
-        munkicommon.display_warning("The PackageVerificationMode key is "
-            "missing in the ManagedInstalls.plist. Please add it.")
-        munkicommon.display_warning("Package integrity checking is disabled.")
         return True
     elif mode.lower() == 'none':
         munkicommon.display_warning("Package integrity checking is disabled.")
@@ -1064,8 +1061,8 @@ def verifySoftwarePackageIntegrity(manifestitem, file_path, item_pl, item_key):
                 return False
             else:
                 munkicommon.display_warning(
-                    "Package integrity checking is disabled for %s."
-                    % manifestitem)
+                    "Reference hash value missing for %s -- package integrity "
+                    "verification skipped." % manifestitem)
                 return True
 
     else:
@@ -2348,6 +2345,10 @@ def check(client_id=''):
     getMachineFacts()
     munkicommon.report['MachineInfo'] = machine
 
+    if not munkicommon.pref('PackageVerificationMode')
+        munkicommon.display_warning("The PackageVerificationMode key is "
+            "missing in the ManagedInstalls.plist. If you wish to have packages"            " verified, please add it.")
+
     ManagedInstallDir = munkicommon.pref('ManagedInstallDir')
 
     if munkicommon.munkistatusoutput: