munkicommon: pylint cleanup, better handling of items in the pkgutil database that don't have a version number (I didn't know this was possible!).

appleupdates: pylint cleanup; provide installed_size data for Managed Software Update display

managedsoftwareupdate: move "Checking for available Apple Software Updates..." message to appleupdates.checkForSoftwareUpdates()

makepkginfo: fix installer_item_size determination when we add up the contents of a directory (was bytes, now Kbytes like everything else)

git-svn-id: http://munki.googlecode.com/svn/trunk@725 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-09-07 18:04:40 +00:00
parent a82374aaf3
commit 121ecb0484
4 changed files with 70 additions and 59 deletions
-8
View File
@@ -516,14 +516,6 @@ def main():
# if there are no munki updates,
# are we supposed to check for and install Apple Software Updates?
if munkicommon.pref('InstallAppleSoftwareUpdates'):
if options.munkistatusoutput:
munkistatus.message("Checking for available "
"Apple Software Updates...")
munkistatus.detail("")
munkistatus.percent(-1)
else:
munkicommon.display_status("Checking for available "
"Apple Software Updates...")
try:
if appleupdates.appleSoftwareUpdatesAvailable(
forcecheck=(options.manualcheck or