Commit Graph

359 Commits

Author SHA1 Message Date
Greg Neagle 84bd6e2b7f Changes to support resuming partial downloads and re-downloading items if the Etag has changed.
git-svn-id: http://munki.googlecode.com/svn/trunk@523 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-04-26 23:49:39 +00:00
Greg Neagle 25e1788b24 Minor fixes
git-svn-id: http://munki.googlecode.com/svn/trunk@522 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-04-26 16:41:08 +00:00
Greg Neagle d555861c4f Fixed bug in getCatalogInfoFromDmg that could lead to an unhandled exception if there are no supported installer items on a disk image.
git-svn-id: http://munki.googlecode.com/svn/trunk@520 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-04-08 22:30:04 +00:00
Greg Neagle 4b6606d76a in getAppleUpdates(), check prefs['InstallAppleSoftwareUpdates'] to handle the case where munki has found AppleUpdates, but admin has later set InstallAppleSoftwareUpdates to False.
git-svn-id: http://munki.googlecode.com/svn/trunk@519 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-29 17:18:09 +00:00
Greg Neagle 2e49e39b9d Fixed typo.
git-svn-id: http://munki.googlecode.com/svn/trunk@517 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-25 16:53:36 +00:00
Greg Neagle 2fa1aa7e33 Some changes to make removepackages work with the QuarkXPress 8.x packages. These are broken in some subtle way such that under Snow Leopard, they leave receipts in /Library/Receipts/. When trying to remove them, pkgutil by itself does not provide the IFPkgRelocatedPath info we need to find the installed items, so we have to dig into the old-style bundle packages as well.
Also, changing the search order in getpkgkeys() - previously it searched on package names first, and if that failed to turn up anything, it searched on pkgids.  Since normally we have a package id to work with, searching on pkgids first gives us better results. 

git-svn-id: http://munki.googlecode.com/svn/trunk@516 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-17 22:03:20 +00:00
Greg Neagle 6a91c91388 Write all the curl options to a file and pass that to curl so we avoid the problem of URLs showing up in a process listing
git-svn-id: http://munki.googlecode.com/svn/trunk@515 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-17 21:55:24 +00:00
Greg Neagle 85ec3fefdf Add code to optionally use CN of ClientCertificate as ClientIdentifier.
git-svn-id: http://munki.googlecode.com/svn/trunk@514 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-17 06:36:06 +00:00
Greg Neagle e427231e49 munkicommon: updated display_percent() to work better with the percent progress info from curl.
updatecheck: swapped out urllib2/httplib download code with code that calls curl.

appleupdates.py: code cleanup; removed commented out code

git-svn-id: http://munki.googlecode.com/svn/trunk@513 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-16 18:17:24 +00:00
Greg Neagle 362ca4dce0 Additional cleanup/reorg of compareBundleVersion(). Thanks to Aaron Hall.
git-svn-id: http://munki.googlecode.com/svn/trunk@507 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-12 17:36:53 +00:00
Greg Neagle 781dda8287 Updated compareBundleVersion(item) to also check the Resources folder for an Info.plist if there isn't one in Contents/
checkServer() updated to throw an error when fed a bad URL.

git-svn-id: http://munki.googlecode.com/svn/trunk@506 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-12 00:17:48 +00:00
Greg Neagle 70a4a4ef41 Some safer methods for getting managed_installs and removals from the installinfo, especially when there is NO installinfo because of an upstream failure.
git-svn-id: http://munki.googlecode.com/svn/trunk@503 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-10 03:22:08 +00:00
Greg Neagle f5000ea69e Changed a comment to match the current naming convention.
git-svn-id: http://munki.googlecode.com/svn/trunk@500 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-08 20:54:41 +00:00
Greg Neagle a89b63ceac Accepted patrick.macneal's patch for Issue 4: updatecheck.py uses incorrect URL when downloading manifests via https
git-svn-id: http://munki.googlecode.com/svn/trunk@499 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-08 16:23:23 +00:00
Greg Neagle 57533655d6 Check all pkgs in an Apple Software Update distribution directory for RestartAction info -- sometimes the dist file says no restart required, but one of the packages does require a restart.
git-svn-id: http://munki.googlecode.com/svn/trunk@497 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-05 01:23:07 +00:00
Greg Neagle 92667c9a9b Now uses SBApplication.applicationWithURL_ to get the _MunkiStatusApp object if SBApplication.applicationWithBundleIdentifier_ fails, which it might if MunkiStatus has never been launched on that particular machine.
git-svn-id: http://munki.googlecode.com/svn/trunk@496 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-04 22:48:02 +00:00
Greg Neagle 7c6832dd2e Reworked munkicommon.prefs() to:
1) Cache the prefs after the first read from disk, instead of reading them from disk every time.
	2) Not be called when munkicommon is imported from another module

git-svn-id: http://munki.googlecode.com/svn/trunk@485 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-03 19:25:14 +00:00
Greg Neagle 52e4fbcc3f Updated READ ME
git-svn-id: http://munki.googlecode.com/svn/trunk@482 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-03 18:35:57 +00:00
Greg Neagle e1a56bd4ae Updated READ ME and example ManagedInstalls.plist to better match current defaults.
git-svn-id: http://munki.googlecode.com/svn/trunk@481 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-03 18:34:36 +00:00
Greg Neagle 7d5aeee811 Change to logic in updateInProgress() to minimize the number of calls to SBApplication.applicationWithBundleIdentifier_, which prints annoying warnings to the log.
git-svn-id: http://munki.googlecode.com/svn/trunk@480 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-02 21:22:54 +00:00
Greg Neagle 27a4506e11 More changes for optional suppress_bundle_relocation behavior...
git-svn-id: http://munki.googlecode.com/svn/trunk@479 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-03-01 20:28:36 +00:00
Greg Neagle badf0d0e33 Made suppressing bundle relocation dependent on a suppress_bundle_relocation key in the pkginfo.
git-svn-id: http://munki.googlecode.com/svn/trunk@478 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-27 00:35:48 +00:00
Greg Neagle 217f20ad56 Added use_shadow=True to invocation of munkicommon.mountdmg() in installWithInfo() so that removeBundleRelocationInfo() might actually work.
git-svn-id: http://munki.googlecode.com/svn/trunk@477 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-24 19:25:37 +00:00
Greg Neagle 9b212c9825 Wait a bit longer before giving up when checking to see if an updatecheck was successfully kicked off.
git-svn-id: http://munki.googlecode.com/svn/trunk@476 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 22:06:43 +00:00
Greg Neagle 647a6da41e Added debug logging to removeBundleRelocationInfo()
git-svn-id: http://munki.googlecode.com/svn/trunk@475 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 21:15:07 +00:00
Greg Neagle 9f5a194cc0 Updated bootstrapping info.
git-svn-id: http://munki.googlecode.com/svn/trunk@474 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 18:24:56 +00:00
Greg Neagle 3a23256743 Updated pkginfo examples and READ ME for pkginfo examples.
git-svn-id: http://munki.googlecode.com/svn/trunk@473 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 18:22:15 +00:00
Greg Neagle 54ac0b4f1a Updated comments.
git-svn-id: http://munki.googlecode.com/svn/trunk@472 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 17:11:04 +00:00
Greg Neagle 53f1ec3eff Minor formatting changes.
git-svn-id: http://munki.googlecode.com/svn/trunk@471 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 17:10:18 +00:00
Greg Neagle ca16501573 Better handling of situations where MunkiStatus might go away in the middle of a session.
git-svn-id: http://munki.googlecode.com/svn/trunk@470 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-23 00:22:51 +00:00
Greg Neagle d6908fdd52 Fixed typos in adobeSetupError()
git-svn-id: http://munki.googlecode.com/svn/trunk@467 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-20 18:03:12 +00:00
Greg Neagle 33bedf4a74 Altered logic when waiting to see if we were successful in starting an update check.
git-svn-id: http://munki.googlecode.com/svn/trunk@466 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-19 01:05:13 +00:00
Greg Neagle 7538a9190b Fixed typo in comment; wrapped more of removeBundleRelocationInfo() in try/except blocks to avoid issues with really old package formats (like the Cisco VPN installer package!)
git-svn-id: http://munki.googlecode.com/svn/trunk@465 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-19 01:03:40 +00:00
Greg Neagle f87d3b78e8 Removed some munkistatus workaround code.
git-svn-id: http://munki.googlecode.com/svn/trunk@464 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-18 00:53:54 +00:00
Greg Neagle e4681ccd6f Appearance tweaks in Managed Software Update.app
git-svn-id: http://munki.googlecode.com/svn/trunk@463 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-18 00:53:10 +00:00
Greg Neagle 538c859edf Code cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@462 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-18 00:12:15 +00:00
Greg Neagle 1c1c8ab7a0 Fixed MunkiStatus wait-for-startup logic so initial messages to MunkiStatus don't get dropped.
git-svn-id: http://munki.googlecode.com/svn/trunk@461 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-18 00:10:03 +00:00
Greg Neagle 9093373f84 Changed com.googlecode.munki.MunkiStatus.plist launch path to new location for MunkiStatus.app
Changed com.googlecode.munki.ManagedSoftwareUpdate.plist launch path to full path for Managed Software Update.app

git-svn-id: http://munki.googlecode.com/svn/trunk@460 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-17 18:44:12 +00:00
Greg Neagle eb43b858a3 Various cleanups: replaced use of dateutil.dateparse methods with NSDate methods, etc.
git-svn-id: http://munki.googlecode.com/svn/trunk@459 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-17 18:42:10 +00:00
Greg Neagle 934f1329bc New PyObjC-based version of Managed Software Update.app.
git-svn-id: http://munki.googlecode.com/svn/trunk@458 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-17 18:39:22 +00:00
Greg Neagle 63380a48dd Removing AppleScript Studio version of ManagedSoftwareUpdate.app
git-svn-id: http://munki.googlecode.com/svn/trunk@457 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-17 18:35:39 +00:00
Greg Neagle a4cf1dfb04 In Managed Software Update.app, replaced NSTextView that was used to display detail with a WebView.
appleupdate.py - parseDist() now returns HTML description without trying to convert it to plain text. This HTML description is displayed in Managed Software Update.app's new WebView.

git-svn-id: http://munki.googlecode.com/svn/trunk@456 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-10 18:26:44 +00:00
Greg Neagle 6b3c47e3e5 Changed evidenceIsInstalled() and processRemoval() logic to better handle non Apple package-installed items.
git-svn-id: http://munki.googlecode.com/svn/trunk@455 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-10 18:24:20 +00:00
Greg Neagle 14c94e8f9f Add a short sleep to the loop than waits for the other instance(s) of managedsoftwareupdate to exit.
git-svn-id: http://munki.googlecode.com/svn/trunk@454 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-09 16:28:48 +00:00
Greg Neagle dc234c3dc2 Shorten the sleep time before removing the trigger file when using launchd trigger file to launch MunkiStatus.app
git-svn-id: http://munki.googlecode.com/svn/trunk@453 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 23:19:30 +00:00
Greg Neagle c6025b5500 managedsoftwareupdate: better handle the case where manaagedsoftwareupdate --auto is already running when a user invokes Managed Software Update.app
git-svn-id: http://munki.googlecode.com/svn/trunk@452 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 23:18:12 +00:00
Greg Neagle 57d60ad22f launchapp now sleeps 10 seconds if it's called from a context other than the current GUI user to avoid launchd throttling.
git-svn-id: http://munki.googlecode.com/svn/trunk@451 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 22:33:11 +00:00
Greg Neagle 8ce70faad0 Cleanup of pkginfo examples.
git-svn-id: http://munki.googlecode.com/svn/trunk@450 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 19:26:12 +00:00
Greg Neagle f1e0f94580 MunkiStatus.app should now properly display in front of the loginwindow when Fast User Switching is active and we're switched to the loginwindow with (possibly) a user switched out.
git-svn-id: http://munki.googlecode.com/svn/trunk@449 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 19:25:25 +00:00
Greg Neagle e562922e6e More com.googlecode.munki.munkistatus vs com.googlecode.munki.MunkiStatus cleanup
git-svn-id: http://munki.googlecode.com/svn/trunk@448 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-08 19:23:14 +00:00