c93fb32e7a
Changed timing of recordUpdateCheckResult() so Managed Software Update.app would display an appropriate message if there were no munki updates and Apple's Software Update was also checked.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@378 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-20 18:35:31 +00:00
c51bff7647
Fix when looking for install item in mounted disk image.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@376 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:27:19 +00:00
3a9ee38de9
Changed logic around Apple Updates:
...
if munki updates are available, they are applied, and Apple Updates are ignored.
Apple Updates are presented and acted upon only if InstallAppleSoftwareUpdates preference is set and there are no available munki updates.
git-svn-id: http://munki.googlecode.com/svn/trunk@375 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:26:25 +00:00
47cbc58a26
Added function to clear Apple Update info.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@374 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:23:36 +00:00
c1ea0d202d
Exception/error handling changes
...
git-svn-id: http://munki.googlecode.com/svn/trunk@373 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:22:52 +00:00
37fb8225f9
Comment change
...
git-svn-id: http://munki.googlecode.com/svn/trunk@372 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:22:15 +00:00
246d0f9be5
updatecheck.py: added support for "RecommendRestart" RestartAction
...
git-svn-id: http://munki.googlecode.com/svn/trunk@371 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:21:50 +00:00
9bc637d706
Fixed use of package_path key in pkginfo.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@370 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-19 03:20:07 +00:00
9322485665
Added support for a 'package_path' key in pkg info to indicate a specific package on a disk image containing multiple packages, or where the package to be installed is not at the root of the disk image.
...
For Adobe packages, 'package_path' now replaces 'adobe_package_name' with the same functionality.
git-svn-id: http://munki.googlecode.com/svn/trunk@368 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-18 17:46:56 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e165e62b49
git-svn-id: http://munki.googlecode.com/svn/trunk@327 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-16 17:23:38 +00:00
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
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
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
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
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
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