Commit Graph

41 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Greg Neagle
a747271859 Some changes to better handle Fast User Switching
git-svn-id: http://munki.googlecode.com/svn/trunk@405 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-12-16 17:48:38 +00:00
Greg Neagle
e8c33ce5fd Version changed to 0.4.7
Added default value manualcheck=False to notifyUserOfUpdates() in managedsoftwareupdate.

git-svn-id: http://munki.googlecode.com/svn/trunk@387 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-12-02 00:03:21 +00:00
Greg Neagle
931feef795 Added new flag: --installwithnologout to be used by launchd Launch Daemon when a user kicks off an install session without logging out. No new functionality, just better bookkeeping.
git-svn-id: http://munki.googlecode.com/svn/trunk@385 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-25 19:56:03 +00:00
Greg Neagle
844054c57b Fixed restart problem introduced with the try/except block around installer.run() in managedsoftwareupdate
git-svn-id: http://munki.googlecode.com/svn/trunk@382 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-24 23:46:05 +00:00
Greg Neagle
e0b27a8841 Added try/except around calls to updatecheck.check, installer.run, and appleupdates.installAppleUpdates so we can capture unhandled exceptions and report/log them.
git-svn-id: http://munki.googlecode.com/svn/trunk@380 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-11-23 17:05:51 +00:00
Greg Neagle
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
Greg Neagle
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
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
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
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
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
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
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
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
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
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
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
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
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
080ba42ca5 managedsoftwareupdate now records the date and result of the last check in /Library/Preferences/ManagedInstalls.plist. This is used by Managed Software Update.app.
git-svn-id: http://munki.googlecode.com/svn/trunk@237 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-29 17:17:09 +00:00
Greg Neagle
0a22ae7370 Yet another try to get rid of obsolete directories and files... Grr.
Also changes to these:
managedsoftwareupdate
   - Changed osascript call to munkicommon
munkilib/installer.py
   - Changed osascript call to munkicommon
   - Changed GUI restart notifcation to use the new munkistatus.restartAlert() call.
munkilib/munkicommon.py
   - Moved osascript function from munkistatus to munkicommon.
munkilib/munkistatus.py
   - Complete rewrite to go with the new MunkiStatus.app 
?\127


git-svn-id: http://munki.googlecode.com/svn/trunk@228 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 22:25:45 +00:00
Greg Neagle
91cd597322 Removed commented-out lines as part of a general cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@215 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 00:02:38 +00:00
Greg Neagle
d5846a56d8 Changed from #!/usr/bin/env python to #!/usr/bin/python because we need to use Apple's installed Python, and not whatever python the user happens to be using...
git-svn-id: http://munki.googlecode.com/svn/trunk@210 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:51:53 +00:00
Greg Neagle
c6ff01072a Added try/except block in clearLastNotifiedDate because FoundationPlist.readPlist raises an Exception when the plist is missing.
git-svn-id: http://munki.googlecode.com/svn/trunk@196 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-28 18:21:13 +00:00
Greg Neagle
f64408f132 Changed a call from munkicommon.readPlist to FoundationPlist.readPlist.
git-svn-id: http://munki.googlecode.com/svn/trunk@178 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-24 17:25:24 +00:00
Greg Neagle
423c31340d Lots of replacing of plistlib.readPlist() with munikcommon.readPlist() so we can handle binary plists.
More fixes for JAMF Composer-generated packages.

git-svn-id: http://munki.googlecode.com/svn/trunk@150 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-07-31 16:34:02 +00:00
Greg Neagle
7641e26738 Cleanup the munkicommon.tmpdir on exit.
git-svn-id: http://munki.googlecode.com/svn/trunk@148 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-07-31 14:49:16 +00:00
Greg Neagle
e539e167a4 Minor output message tweaks.
git-svn-id: http://munki.googlecode.com/svn/trunk@137 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-07-27 18:30:10 +00:00
Greg Neagle
1701e13b6c More tools refactoring.
Added --logoutinstall and --manualcheck options for specific run modes.

When running in --logoutinstall mode, it now checks for the existence of a flag to make sure the user triggered the update.

--manualcheck now allows the GUI Managed Software Update.app to trigger an update check if the user manually launches Managed Software Update.app and there are no pre-staged updates.

git-svn-id: http://munki.googlecode.com/svn/trunk@123 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-07-20 18:35:06 +00:00
Greg Neagle
07cfc5235c Moved all support libraries into munkilib package.
Combined installcheck and managedinstaller into managedsoftwareupdate to avoid race conditions between the two tools.
Removed support for Apple Software Updates (because it didn't work correctly!)


git-svn-id: http://munki.googlecode.com/svn/trunk@112 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-07-14 18:04:34 +00:00