* 'master' of https://code.google.com/p/munki:
Attempt to adjust makecatalogs to play nicer with PackageURL and PackageCompleteURL keys in pkginfo files
Adjust error messages; convert munkicommon.display_foo() calls to use extra args instead of % interpolation
Fix exception syntax to be python2.5 compatible, maintaining support for OS X 10.5 Leopard.
s/munki\./munkicommon./g to fix display_error calls added in rf8c46ec3eb955cef6a2aefcc52be090234ac3705
Initial support for checking for available licensed seats for uninstalled optional_installs
Bumping version.plist for next round of development.
If self-serve/etc. manifests are corrupt, log and pass instead of crashing.
Corrected a typo, thanks to Greg Neagle.
Cleaned up the localization a bit.
* master:
More localization fixes.
Localization fix for the message: 'A restart is required after updating. Please be patient as there may be a short delay at the login window. Log out and update now?'
Updated Swedish localization by peter.wreiber@gmail.com
Track whether an update was installed in "only_unattended" mode or not in InstallResults, for additional reporting on various Munki servers.
updated spanish strings for consistency
Change application data collection code so that system_profiler SPApplicationsDataType is called only once per Munki session, even if system_profiler fails or hangs.
Remove -d option from munkiimport as it conflicts with -d option to makepkginfo
Don't display 'Running installcheck_script/uninstallcheck_script for foo...' messages when checking for updates.
Support for installing AAMEE/CCP packages that include updates.
Fix "NameError: name 'report_broken_python' is not defined" crash when attempting to report a broken Python install. The file hasn't been parsed at this point, so the report_broken_python function is nonexistent.
Fix case where munkicommon.getAppBundleExecutable() returns None due to non-existent Info.plist, causing Munki to crash when parsing the None executable name.
Patch to adobeutils.py from Pepijn Bruienne <bruienne@gmail.com> to allow makepkginfo to properly parse an Adobe Creative Cloud product package built with Creative Cloud Packager.
Fix typo in French localization.
Updated French localization from Richard Lafontaine <iceman.grrrr@gmail.com>
Add Swedish localization from Peter Wreiber <peter.wreiber@gmail.com>
minor correction to the spanish translation
* master:
Fix makepkginfo --force_install_after_date to create a date object for the pkginfo plist instead of a string.
If a force_install_after_date install is near/past it's due date, logouthelper should be started (the machine should be forcefully rebooted) even if someone is logged in but the session is at the loginwindow (fast user switching). Force should not be "force unless x, y, z".
Add --repo_path and --repo_url options to munkiimport to allow the user to override the default repo_path and repo_url options set via munkiimport --configure at runtime
If we are about to do an install at the loginwindow, check to see if FileSyncAgent.app is running. This might be HomeSync running during a login process. If so, don't install.
Change apple_item logic in updatecheck.processRemoval to match that in updatecheck.processInstall. Specifically, allow admin to override detection of apple_item by explictly setting it in the pkginfo.
Update version.plist to 0.9.0 for next development round.
Greg Neagle