Commit Graph

185 Commits

Author SHA1 Message Date
Greg Neagle 84051d3e5e install() now resolves symlinks before passing them to /usr/bin/installer so that mpkgs that refer to relative paths to component packages can actually find the subpackages.
copyAppFromDMG() now removes a pre-exising app in /Applications before copying the app from the DMG to more closely mimic the Finder behavior.
Fixed call the xattr in copyAppFromDMG()

installWithInfo() now only uses the first partition of a mounted diskimage, instead of all partitions. Added support for a new 'pkg_path' key to pkg info so an admin can specify a specific package to be installed from a disk image.

Begin support for uninstalling Adobe CS3 deployment packages (currently untested)


git-svn-id: http://munki.googlecode.com/svn/trunk@326 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 17:22:51 +00:00
Greg Neagle ed1b8a637f Refactored the runAdobeSetup() and runAdobeUberTool() functions, moving shared code to runAdobeInstallTool().
Fixed typos in adobeSetupError()

Added code to runAdobeSetup() to begin support for CS3 Deployment packages. (Currently untested)

git-svn-id: http://munki.googlecode.com/svn/trunk@325 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 17:15:43 +00:00
Greg Neagle 1e273f619a D'oh! Part two of fix for logoutinstalls with available Apple Updates, but no available munki updates
git-svn-id: http://munki.googlecode.com/svn/trunk@323 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-12 00:19:17 +00:00
Greg Neagle f80eff278b Logic changes to get proper logoutinstall behavior when there is an available Apple Update but no munki update.
git-svn-id: http://munki.googlecode.com/svn/trunk@322 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-12 00:09:26 +00:00
Greg Neagle 9ff9879959 Bumped Managed Software Update.app to version 1.3.2.
Added new alert for when app cannot check for updates because the manifest server is not accessible.

git-svn-id: http://munki.googlecode.com/svn/trunk@321 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-11 23:41:24 +00:00
Greg Neagle d0c6b3ade4 Logging and reporting changes.
Added check for server availability before starting an update session.

git-svn-id: http://munki.googlecode.com/svn/trunk@320 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-11 23:39:32 +00:00
Greg Neagle b4beeafcfe Lots of logging and reporting changes.
Added munkicommon.validPlist() to check for plist validity when getting a manifest or catalog file.
Added call to updatecheck.checkServer() to test for server availability before doing a check for updates.

git-svn-id: http://munki.googlecode.com/svn/trunk@319 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-11 23:38:12 +00:00
Greg Neagle d0854962d5 Bumped internal version to 0.4.7b
git-svn-id: http://munki.googlecode.com/svn/trunk@318 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-05 17:44:39 +00:00
Greg Neagle 1b1d43b125 Added support for log rolling to managedsoftwareupdate.
git-svn-id: http://munki.googlecode.com/svn/trunk@317 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-05 17:39:58 +00:00
Greg Neagle 3fa262ea69 - Lots of logging changes: new munkicommon.display_warning() function to more cleanly separate warnings from errors. New warnings.log, errors.log, and Installs.log. logs are now rotated, so they won't grow forever.
- new munkicommon.pref keys: CatalogURL and PackageURL; these replace SoftwareRepoURL, and are base URLs for catalogs and installer items respectively. This allows you to divide up hosting of the munki pieces on multiple servers -- manifests and catalogs could be on one server, and the actual install packages on another.

git-svn-id: http://munki.googlecode.com/svn/trunk@316 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-05 17:38:39 +00:00
Greg Neagle b3e8e1e69e processRemoval() now adds any updates to be removed to the list before it adds the main item.
git-svn-id: http://munki.googlecode.com/svn/trunk@306 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 23:40:21 +00:00
Greg Neagle 6524802657 Renamed munkicommon.version() to munkicommon.get_version() to prevent name conflict with the version library from the distutil module.
git-svn-id: http://munki.googlecode.com/svn/trunk@305 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 23:10:12 +00:00
Greg Neagle 0e4bc73db9 Added -V option to managedsoftwareupdate to print the version of the munki tools.
git-svn-id: http://munki.googlecode.com/svn/trunk@304 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 18:57:45 +00:00
Greg Neagle ff664ddea3 Added version() function to return the version of the munkitools. Used by managedsoftwareupdate -V.
git-svn-id: http://munki.googlecode.com/svn/trunk@303 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 18:56:11 +00:00
Greg Neagle b27031d3f9 - Changes to processInstall() so that if a specific version is given, it will not look for any updates.
- When removing packages by receipts, and filtering by reference count results in an empty receipt list, print a warning and return False to indicate we cannot remove this item.
- the database of installed packages (built from receipt info) is now not generated until the first time we have to determine if we can remove an item using 'removepackages'. This should speed things up if there are no defined removals for a given client.


git-svn-id: http://munki.googlecode.com/svn/trunk@302 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 18:54:47 +00:00
Greg Neagle 5418c4ac53 Added try/except around removing Apple updates plist files.
git-svn-id: http://munki.googlecode.com/svn/trunk@301 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-02 18:48:49 +00:00
Greg Neagle b6f3444d2c munkistatus output tweak.
git-svn-id: http://munki.googlecode.com/svn/trunk@300 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-30 15:29:40 +00:00
Greg Neagle 8d82225f84 Added support for a new 'update_for' key in pkginfo, so a package can be marked as an update for one or more seemingly unrelated packages.
git-svn-id: http://munki.googlecode.com/svn/trunk@299 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-30 15:28:56 +00:00
Greg Neagle b2ef8d288f Minor bug fixes and code cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@298 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-30 15:27:43 +00:00
Greg Neagle 13cdb31c28 Changes to output for better progress indication when there are multiple items to be installed or removed.
git-svn-id: http://munki.googlecode.com/svn/trunk@297 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-30 15:27:04 +00:00
Greg Neagle fce4f6fab2 Added a check for diskimages with Software License Agreements. These cannot be automatically mounted by hdiutil, so they are useless to munki.
git-svn-id: http://munki.googlecode.com/svn/trunk@295 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-23 22:58:56 +00:00
Greg Neagle 2141e264ee Fixed issue with removals in included manifests that don't have their own catalog lists, but instead rely on the parent's catalog list.
git-svn-id: http://munki.googlecode.com/svn/trunk@294 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-23 17:46:18 +00:00
Greg Neagle 660a8a8e98 Added support for "appdmg" package type. This is a dmg that contains a single application at the root of the mounted dmg, which is then copied to /Applications (for install) or simply rm -rf /Applications/appname (for removal).
makepkginfo generates pkginfo files for this package type, and updatecheck.py and installer.py have the appropriate additions.

git-svn-id: http://munki.googlecode.com/svn/trunk@279 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-22 21:42:57 +00:00
Greg Neagle 15cc60e8fe Bumped to version 1.3.1.
Fixed a bug when there are items to be removed causing them not to be displayed.
Added a restart status field at the bottom of the window to be more like Apple Software Update.

git-svn-id: http://munki.googlecode.com/svn/trunk@278 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-22 21:39:41 +00:00
Greg Neagle 83e10ef4b6 Updated adobeutils.getAdobeUpdateInfo() to handle update DMGs with multiple payloads.
Removed makeadobepkinfo, as its functionality has been merged into makepkginfo


git-svn-id: http://munki.googlecode.com/svn/trunk@277 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-21 22:04:49 +00:00
Greg Neagle ebaf5ded27 Added getAdobeUpdateInfo() to parse Adobe update DMGs for pkginfo.
git-svn-id: http://munki.googlecode.com/svn/trunk@276 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-21 18:56:26 +00:00
Greg Neagle c88108f207 Merged makeadobepkginfo and makepkginfo.
git-svn-id: http://munki.googlecode.com/svn/trunk@275 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-21 18:55:21 +00:00
Greg Neagle f8b28a05fb makepkginfo can now be called with only -f arguments, and no actual install item. This generates a list of filesystem items which can by manually added to the 'installs' key of a pkginfo item.
git-svn-id: http://munki.googlecode.com/svn/trunk@266 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-20 23:37:46 +00:00
Greg Neagle dd711731f9 Support for AdobeUberInstaller packages like those from CS4 Deployment Toolkit and Adobe Update packages.
Includes new makeadobepkginfo tool, which eventually will be merged with makepkginfo...

git-svn-id: http://munki.googlecode.com/svn/trunk@265 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-20 23:36:04 +00:00
Greg Neagle b947daf2f9 Added Apache 2 license info.
git-svn-id: http://munki.googlecode.com/svn/trunk@264 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-16 23:58:44 +00:00
Greg Neagle bc84138b11 First attempt at support for installing Adobe CS4 stuff using their Uber tools.
git-svn-id: http://munki.googlecode.com/svn/trunk@263 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-16 23:58:05 +00:00
Greg Neagle c4ed70e9f1 Fixes to Apple Update logic.
git-svn-id: http://munki.googlecode.com/svn/trunk@261 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-14 22:14:51 +00:00
Greg Neagle da4b3cd5b6 Apple Software Updates logic fixes.
git-svn-id: http://munki.googlecode.com/svn/trunk@260 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-14 22:13:17 +00:00
Greg Neagle a2c387d657 Various regression fixes.
git-svn-id: http://munki.googlecode.com/svn/trunk@259 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-14 22:12:41 +00:00
Greg Neagle 54e92711e9 Unicode text handling fixes.
git-svn-id: http://munki.googlecode.com/svn/trunk@258 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-14 22:10:50 +00:00
Greg Neagle 80515793f5 Fixed errors in getSoftwareUpdateInfo()
git-svn-id: http://munki.googlecode.com/svn/trunk@257 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:34:30 +00:00
Greg Neagle 4dc3cc93cb Minor output tweak in log info for dependencies.
git-svn-id: http://munki.googlecode.com/svn/trunk@256 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:33:20 +00:00
Greg Neagle 28da312e9a Removed code that does the actual restart. This has been moved to managedsoftwareupdate.
git-svn-id: http://munki.googlecode.com/svn/trunk@255 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:32:11 +00:00
Greg Neagle dce3cd1bb5 Added missing import time.
git-svn-id: http://munki.googlecode.com/svn/trunk@254 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:31:16 +00:00
Greg Neagle 83404f25e7 Changed display of updates from Apple Software Update so they appear first, and only show a restart required if indeed a restart is required.
git-svn-id: http://munki.googlecode.com/svn/trunk@253 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:26:05 +00:00
Greg Neagle e3c4198db3 Added support for hiding and showing the main MunkiStatus window.
git-svn-id: http://munki.googlecode.com/svn/trunk@252 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:07:26 +00:00
Greg Neagle 19edc0df5d Managed Software Update.app
Fixed typo in "Logout Recommended" message
Made sure if AppleUpdates required a restart that logout was required.

git-svn-id: http://munki.googlecode.com/svn/trunk@251 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:06:31 +00:00
Greg Neagle 2412154c7a Changes to munkistatus.py:
Looks for an existing running version of MunkiStatus before trying to launch MunkiStatus.
New hide() and show() functions to hide and show the MunkiStatus window.

git-svn-id: http://munki.googlecode.com/svn/trunk@250 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:03:37 +00:00
Greg Neagle fdaa8f0f2a Added appleupdates.py, which contains functions for working with Apple's Software Update.
Changes to managedsoftwareupdate, munkicommon/py and installer.py to deal with Apple Software Update.

git-svn-id: http://munki.googlecode.com/svn/trunk@249 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:01:28 +00:00
Greg Neagle 68c78c0ebe Fixed a typo in the new support for 'maximum_os_version'
git-svn-id: http://munki.googlecode.com/svn/trunk@247 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 23:13:51 +00:00
Greg Neagle 20f97877fd updatecheck.py: Added support for "maximum_os_version" key in pkginfo
git-svn-id: http://munki.googlecode.com/svn/trunk@246 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 23:07:29 +00:00
Greg Neagle 516d7d75f3 Add filepath to exception raised in readPlist when it's a bad plist file.
git-svn-id: http://munki.googlecode.com/svn/trunk@245 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:02:40 +00:00
Greg Neagle 96251a968e Fix in special-case processing of Microsoft Office 2008 packages on Snow Leopard.
git-svn-id: http://munki.googlecode.com/svn/trunk@244 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:01:14 +00:00
Greg Neagle 9bcc50a325 Smarter handling of malformed Info.plists in packages. Instead of throwing an exception, return pkginfo describing the problem.
git-svn-id: http://munki.googlecode.com/svn/trunk@243 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:00:17 +00:00
Greg Neagle 33e0d69436 Fixed bug in munkicommon.getExtendedVersion() that could return None instead of "0.0.0.0.0".
git-svn-id: http://munki.googlecode.com/svn/trunk@242 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-01 23:49:20 +00:00