Commit Graph

357 Commits

Author SHA1 Message Date
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 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 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 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 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
Greg Neagle 5c128b5574 munkicommon: New currentGUIusers() function to get list of current GUI users
managedsoftwareupdate: makes use of munkicommon.currentGUIusers() to more accurately determine if anyone is logged in to the GUI (Fast User Switching aware)

git-svn-id: http://munki.googlecode.com/svn/trunk@445 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-06 00:55:06 +00:00
Greg Neagle 36e4d6e727 Stub code for the case where Fast User Switching is active, we're switched to the loginwindow with one or more users logged in, and we need to restart.
git-svn-id: http://munki.googlecode.com/svn/trunk@443 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-05 23:00:29 +00:00
Greg Neagle c3b3dd8a04 If there are multiple logged-in GUI users, Managed Software Update.app now presents a warning and prevents doing an update.
git-svn-id: http://munki.googlecode.com/svn/trunk@442 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-05 22:58:57 +00:00
Greg Neagle 5cb0aac96c Removed code in awakeFromNib that set the text in the status and detail fields to default values; this was sometimes writing over the initial message from munkistatus.py.
git-svn-id: http://munki.googlecode.com/svn/trunk@441 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-05 22:02:27 +00:00
Greg Neagle 28d3f1596d Added new launchapp tool to make sure MunkiStatus.app and Managed Software Update.app are launched only in the context of the current GUI user.
Updated LaunchAgents com.googlecode.munki.munkistatus.plist and com.googlecode.munki.ManagedSoftwareUpdate.plist to call the launchapp tool.

git-svn-id: http://munki.googlecode.com/svn/trunk@440 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-05 18:50:17 +00:00
Greg Neagle e0d31bfbbf Fixed stupid typo in code that removes the shadow file when it removes disk images after install.
git-svn-id: http://munki.googlecode.com/svn/trunk@439 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-04 21:15:26 +00:00
Greg Neagle 7fa63d36ad Version number bumps to get ready for 0.5.0 release
git-svn-id: http://munki.googlecode.com/svn/trunk@438 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-04 21:00:17 +00:00
Greg Neagle 47385bac22 Changes to use the new LaunchAgent mechanism to allow managedsoftwareupdate (running in the root context) to reliably launch Managed Software Update.app in the user's context.
git-svn-id: http://munki.googlecode.com/svn/trunk@437 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-04 18:56:48 +00:00
Greg Neagle 2bb654567c Fixed edge case in getVersionString() where package's Info.plist contains empty CFBundleShortVersionString or empty CFBundleVersion.
git-svn-id: http://munki.googlecode.com/svn/trunk@435 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-03 20:20:16 +00:00
Greg Neagle 01180408a9 munkicommon.py/mountdmg() now has an option to mount dmgs with shadow files to allow read-write access to read-ony disk images.
installer.py now mounts disk images with -shadow option to enable the next change - 
For bundle-style packages, installer.py/install() now attempts to remove any bundle relocation info to disable installer's bundle relocator. This should force items to install to their default locations.

git-svn-id: http://munki.googlecode.com/svn/trunk@434 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-03 18:14:16 +00:00
Greg Neagle d895a4c106 Fixed typo in lookforUpdates function in updatecheck that could cause an unhandled exception.
git-svn-id: http://munki.googlecode.com/svn/trunk@433 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-02-02 17:59:57 +00:00
Greg Neagle bd83d5381c Change to copyAppFromDMG() so that apps copied to /Applications are owned by root.
git-svn-id: http://munki.googlecode.com/svn/trunk@432 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-01-13 16:27:58 +00:00
Greg Neagle 100ef1d783 Better Pythonized the getIdleSeconds() function.
git-svn-id: http://munki.googlecode.com/svn/trunk@431 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-01-10 17:24:06 +00:00
Greg Neagle 1ce32d0d51 Minor output tweaks.
git-svn-id: http://munki.googlecode.com/svn/trunk@430 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-01-10 16:47:58 +00:00
Greg Neagle bf0cb48c5c Bumped tools version to 0.4.9.
Changed munkistatus.py to follow Apple's recommendations and use a launchd LaunchAgent to launch MunkiStatus.app instead of using LaunchServices from a daemon.



git-svn-id: http://munki.googlecode.com/svn/trunk@419 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-01-06 00:37:18 +00:00
Greg Neagle c1acf06795 Updated copyright info for 2010; added cleanup of launchd launch paths for runtype = "installwithnologout" and runtype = "manualcheck".
git-svn-id: http://munki.googlecode.com/svn/trunk@418 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-01-06 00:34:03 +00:00