Commit Graph

246 Commits

Author SHA1 Message Date
Greg Neagle d50290939f Exception handling cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@367 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 06:10:19 +00:00
Greg Neagle 793b48baaf Reformatted help strings
git-svn-id: http://munki.googlecode.com/svn/trunk@366 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:57:05 +00:00
Greg Neagle 27728a7441 Reformatted option help strings
git-svn-id: http://munki.googlecode.com/svn/trunk@365 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:54:57 +00:00
Greg Neagle 5a2bf9e3d8 Exception handling cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@364 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:53:11 +00:00
Greg Neagle f712554195 Cleaned up exception handling
git-svn-id: http://munki.googlecode.com/svn/trunk@363 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:47:43 +00:00
Greg Neagle 4099899d37 Cleaned up exception handling.
git-svn-id: http://munki.googlecode.com/svn/trunk@362 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:44:30 +00:00
Greg Neagle ebf9088150 Cleanup exception handling.
git-svn-id: http://munki.googlecode.com/svn/trunk@361 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:32:36 +00:00
Greg Neagle 79148660d9 Replaced generic except: clauses with more specific.
git-svn-id: http://munki.googlecode.com/svn/trunk@360 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:28:57 +00:00
Greg Neagle 451bb6ca10 Fixed exception tuple,
git-svn-id: http://munki.googlecode.com/svn/trunk@359 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:19:59 +00:00
Greg Neagle fc7570449b Cleanup of exception handling
git-svn-id: http://munki.googlecode.com/svn/trunk@358 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 05:16:58 +00:00
Greg Neagle 0b55bf27ae Cleaned up exception handling
git-svn-id: http://munki.googlecode.com/svn/trunk@357 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 04:43:50 +00:00
Greg Neagle 827c4b5264 Cleaned up exception handling
git-svn-id: http://munki.googlecode.com/svn/trunk@356 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 04:39:24 +00:00
Greg Neagle 5ea46d211b PEP-8 line length cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@355 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 04:15:59 +00:00
Greg Neagle 5aa68dbe00 PEP-8 line length cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@354 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 04:14:13 +00:00
Greg Neagle cdba90d75e PEP-8 cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@353 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 02:22:49 +00:00
Greg Neagle 3b7d335b04 More PEP-8 cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@352 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 02:03:05 +00:00
Greg Neagle 4456101d14 PEP-8 cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@351 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 01:45:04 +00:00
Greg Neagle 510ca09f0e More PEP-8 cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@350 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 01:43:13 +00:00
Greg Neagle d34876af17 Line length cleanup ala PEP-8
git-svn-id: http://munki.googlecode.com/svn/trunk@349 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 01:39:16 +00:00
Greg Neagle 00f7ba39e5 PEP-8 line length cleanup. Wasn't sure how to break the sqlite3 commands, so left them alone.
git-svn-id: http://munki.googlecode.com/svn/trunk@348 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 00:04:54 +00:00
Greg Neagle 8e7811cea2 PEP-8 formatting cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@347 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 23:38:21 +00:00
Greg Neagle 893a0c8919 More PEP-8 cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@346 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 23:36:53 +00:00
Greg Neagle 4c29533bac Reformatted line lengths to comply with PEP-8
git-svn-id: http://munki.googlecode.com/svn/trunk@345 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 23:31:04 +00:00
Greg Neagle 40eaea927b Attempt to adjust line lengths to comply with PEP-8, but long Cocoa method names make it impossible.
git-svn-id: http://munki.googlecode.com/svn/trunk@344 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 22:58:58 +00:00
Greg Neagle d9decdec8d Line length cleanup ala PEP-8
git-svn-id: http://munki.googlecode.com/svn/trunk@343 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 22:53:55 +00:00
Greg Neagle 27a3a78814 More line length cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@342 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 22:35:20 +00:00
Greg Neagle 1fafb43fc2 Line length cleanup ala PEP-8
git-svn-id: http://munki.googlecode.com/svn/trunk@341 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 22:30:32 +00:00
Greg Neagle 132ab42fd1 Line length cleanup ala PEP-8
git-svn-id: http://munki.googlecode.com/svn/trunk@340 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-17 22:17:09 +00:00
Greg Neagle 3d4f6e345a More changes to support Adobe CS3 installs/uninstalls.
pkginfo items with missing name or version attributes no longer cause an exception in updatecheck.py

Safer list comphrensions for various lists

git-svn-id: http://munki.googlecode.com/svn/trunk@333 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 23:57:22 +00:00
Greg Neagle 60b88af2af Workaround for unexpected output from /usr/bin/installer in getInstallerPkgInfo() (plist was preceded by extra non-plist output)
git-svn-id: http://munki.googlecode.com/svn/trunk@332 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 22:08:25 +00:00
Greg Neagle 7a71abc5e5 Fixed another typo in runAdobeSetup()
git-svn-id: http://munki.googlecode.com/svn/trunk@331 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 21:41:28 +00:00
Greg Neagle dcc71ab6ed Fixed typo in runAdobeSetup() for the installxml deployment file.
git-svn-id: http://munki.googlecode.com/svn/trunk@330 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 21:38:55 +00:00
Greg Neagle 425e9c6591 makepkginfo can now create pkginfo for Adobe CS3 installers; better metadata for CS4 installers as well.
git-svn-id: http://munki.googlecode.com/svn/trunk@329 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 19:56:51 +00:00
Greg Neagle 9351ba9bc6 Reorganized the if/then logic to make the flow with the various options a bit cleaner/clearer.
git-svn-id: http://munki.googlecode.com/svn/trunk@328 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 17:25:16 +00:00
Greg Neagle e165e62b49 git-svn-id: http://munki.googlecode.com/svn/trunk@327 a4e17f2e-e282-11dd-95e1-755cbddbdd66 2009-11-16 17:23:38 +00:00
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 c94602c537 Updated getting started instructions.
git-svn-id: http://munki.googlecode.com/svn/trunk@324 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-13 17:51:33 +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 fa98246c8b Updated pkginfo examples with the new 'update_for' key
git-svn-id: http://munki.googlecode.com/svn/trunk@312 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-03 00:18:57 +00:00
Greg Neagle ac633dfaf4 Updated pkginfo examples with the new 'update_for' key
git-svn-id: http://munki.googlecode.com/svn/trunk@311 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-03 00:17:39 +00:00
Greg Neagle 85588f4b6c Updated pkginfo examples with the new 'update_for' key
git-svn-id: http://munki.googlecode.com/svn/trunk@310 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-03 00:17:25 +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