Commit Graph

956 Commits

Author SHA1 Message Date
Greg Neagle
ee07c2be86 When makecatalogs and manifestutil recurse into repo directories, don't enter directories whose names start with a period. Prevents looking into .git and .svn directories. 2012-02-23 15:18:06 -08:00
Greg Neagle
6804a86fb9 Merge branch 'cli' of http://code.google.com/r/davvid-munki-cli 2012-02-23 14:43:57 -08:00
Greg Neagle
ba47144877 makecatalogs now will attempt to use the repo_path defined using munkiimport --configure if no repo path is given on the command line. All errors and warnings are now printed at the end to increase their visibility. munkiimport updated to (normally) suppress most of makecatalog's output unless --verbose is given. 2012-02-23 14:42:54 -08:00
Greg Neagle
6bdd5a6782 Changes to several package-parsing methods in munkicommon.py to enable makepkginfo to get a more accurate list of receipts from Apple metapackages; examples are Xcode releases before 4.3 and the command_line_tools for Xcode 4.3 2012-02-23 10:32:38 -08:00
David Aguilar
bec6f53c3d munkiimport: Specify catalogs from the command-line
Add a --catalog option so that we can specify the default
catalogs to use from the command-line.  Multiple catalogs can
be specified by specifying the option multiple times.
2012-02-22 17:49:41 -08:00
Greg Neagle
cae13631fa MSU.app: Encode update descriptions in UTF-8 before passing to WebKit WebFrame loadData_MIMEType_textEncodingName_baseURL_. Fixes an issue with certain Mac OS X versions. 2012-02-17 14:55:38 -08:00
Justin McWilliams
d20ea289d2 If an item is already in the cache, set download_speed to 0. Previously I just assumed this would always be the case, but I've seen download_installeritem() take 1-2 seconds on larger packages (presumably because of hashing?) 2012-02-16 11:28:39 -05:00
Greg Neagle
2a1cf963e4 Fix issue where managedsoftwareupdate --auto or --quiet would print percentage-done indicators to STDOUT when checking for Apple updates or when removing packages. 2012-02-15 15:17:09 -08:00
Greg Neagle
34ab750460 Changes to allow curl to follow redirects when retreiving an Apple sucatalog; this is needed to support Lion Server's Software Update service. 2012-02-14 16:51:34 -08:00
Greg Neagle
5489fb5dc3 updatecheck.py enoughDiskSpace() -- coerce all installed_size values to integers when calculating available disk space. Fix for broken pkginfo editing that saved installed_size as string instead of integer. 2012-02-14 09:41:08 -08:00
Greg Neagle
6b9f040461 munkiimport: encode all key values in UTF-8 before printing 2012-02-14 08:23:54 -08:00
Greg Neagle
31b3ddbba2 Updated READ ME FIRST.txt with new recommended wiki documentation. 2012-02-13 20:22:51 -08:00
Justin McWilliams
d8e4c6cb15 Ignore calculating download speeds for downloads under 1 MB so small files don't skew avg speeds, as *sustained* download speeds are more helpful. 2012-02-13 10:52:53 -05:00
Justin McWilliams
89e2ab8b81 Move getPIDforProcessName() out of munkicommon and into utils, so it can be
used in modules that munkicommon also imports.
2012-02-10 18:05:51 -05:00
Justin McWilliams
063dc935a5 plists cannot store NoneType, so store 0 for unknown download_kbytes_per_sec 2012-02-10 12:51:27 -05:00
Justin McWilliams
11e5818b75 updatecheck now calculates download speed (KB/s) and installer writes it to ManagedInstallReport.plist::InstallResults dictionaries. 2012-02-10 11:27:45 -05:00
Greg Neagle
2780b414cc Bump version.plist to 0.8.2 for upcoming release 2012-02-09 16:35:13 -08:00
Greg Neagle
05e6aa57e9 Adobe CS4 installs now attempt to kill stalled Adobe AIR processes, just like CS5 installs. This allows installs at the loginwindow to succeed. 2012-02-09 08:28:21 -08:00
Greg Neagle
02a8b0cfc6 Move getPIDforProcessName into munkicommon for use by both munkistatus and adobeutils 2012-02-04 12:13:46 -08:00
Greg Neagle
856a943ff3 Fix for optional_installs managed_uninstalls -- bad intentation 2012-02-03 17:28:58 -08:00
Justin McWilliams
4071808f6e "Another instance of managedsoftwareupdate is running. Exiting." is now (once again?) logged to ManagedSoftwareUpdate.log instead of only being outputted to system.log. 2012-01-27 21:49:23 -05:00
Greg Neagle
38701705b7 Fix for issue 134: makecatalogs now warns if it would overwrite an existing catalog. 2012-01-24 12:10:29 -08:00
Justin McWilliams
32d0241c89 Replace plist footer magic number with calculated string length, ala http://code.google.com/p/munki/source/detail?r=24bb604dfa2494c7c904e13b8a1dee18a17ef25f for plist header. 2012-01-24 12:53:39 -05:00
Justin McWilliams
24bb604dfa Replace magic number with calculated string length, for easier readability and future maintainability. 2012-01-24 12:12:11 -05:00
Justin McWilliams
6c06a48fd7 Clean up appleupdates.GetSoftwareUpdateResource and RetrieveURLToCacheDir docstrings. 2012-01-24 12:05:26 -05:00
Greg Neagle
3a049c4c46 Do not notify user via MSU.app until after postflight script has completed. 2012-01-20 15:04:04 -08:00
Greg Neagle
b651165187 ApplicationInventory.plist now contains filename and CFBundleName for each application item. 2012-01-20 15:03:00 -08:00
Greg Neagle
638e869bc5 Merge branch 'master' into curl-refactor 2012-01-19 08:39:51 -08:00
Justin McWilliams
c7d2f2a9b0 Change utils.runExternalScript() script_args default from an empty list to an empty tuple.
Default arguments are evaluated once at module load time. This may cause problems if the argument is a mutable object such as a list or a dictionary. If the mutable object is changed within the function, those changes will persist to subsequent calls of the function. This wasn't a problem for runExternalScript yet, since the default arg is not changed within the function, but we might as well fix it to protect against potential future bugs.
2012-01-19 11:29:23 -05:00
Justin McWilliams
896bd9a80c If InstallInfo.plist is corrupt, delete it and move on instead of crashing indefinitely. 2012-01-18 14:34:59 -05:00
Greg Neagle
69968229c0 managedsoftwareupdate: warn if DaysBetweenNotifications is not an integer. 2012-01-17 16:45:24 -08:00
Greg Neagle
610a5f204a makecatalogs: better error message when pkginfo installer_item_location is not a string 2012-01-17 09:22:42 -08:00
Greg Neagle
0e0f0b48b0 Clearer error message when more than one argument is given to makepkginfo and munkiimport. 2012-01-17 08:33:08 -08:00
Greg Neagle
05e3df8704 Save ApplicicationInventory report for possible use by postflight reporting scripts 2012-01-17 08:21:18 -08:00
Greg Neagle
0a6f19a4e9 Merge branch 'master' into curl-refactor 2012-01-06 12:42:41 -08:00
Greg Neagle
73b2155117 munkicommon.MunkiLooseVersion can now init from integers and floats 2012-01-06 12:41:27 -08:00
Greg Neagle
dd0ca56ac2 Merge branch 'master' into curl-refactor 2012-01-06 12:32:55 -08:00
Greg Neagle
dc75fd9df4 MunkiLooseVersion objects now correctly initialized when given an empty string. 2012-01-06 12:32:27 -08:00
Greg Neagle
db55fae03b Log when a disk image has an embedded SLA/EULA; updated warning when Spotlight search takes too long. 2012-01-06 11:44:18 -08:00
Greg Neagle
2a6ce0af1f Quick and dirty fixes for processing manifests with conditional_items. Needs a better long term fix. 2012-01-06 11:42:27 -08:00
Greg Neagle
1914a1142a Bump MSU.app version 2012-01-06 11:40:58 -08:00
Greg Neagle
ca03bb0325 Output tweaks; munkicommon.mountdmg() can now mount disk images containing End User License Agreements 2012-01-04 13:54:04 -08:00
Greg Neagle
a0decf2625 Change copyright notice to 2010-2012 2012-01-04 13:52:33 -08:00
Greg Neagle
7aa439d445 Change updatecheck.getMunkiResource() to updatecheck.getResourceIfChangedAtomically() so as not to break existing preflight scripts that might make use of updatecheck.getResourceIfChangedAtomically() 2011-12-22 15:36:13 -08:00
Greg Neagle
96a2536141 appleupdates.py output tweaks; updated tests 2011-12-22 14:32:13 -08:00
Greg Neagle
5651b2a9a4 appleupdates.py now sets User-Agent header; munki-specific cert and header stuff moved to updatecheck; tests updated 2011-12-22 14:01:27 -08:00
Greg Neagle
50833869db Conflict resolution 2011-12-22 09:30:49 -08:00
Justin McWilliams
6e9790c129 If a cached manifest is corrupt, delete it. 2011-12-22 11:27:15 -05:00
Greg Neagle
03a6136ea0 Change appleupdates.py to use fetch.py for downloads 2011-12-21 16:36:52 -08:00
Greg Neagle
7160c4d176 Move a couple more functions from updatecheck.py to fetch.py 2011-12-21 15:02:36 -08:00