Commit Graph

169 Commits

Author SHA1 Message Date
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 83404f25e7 Changed display of updates from Apple Software Update so they appear first, and only show a restart required if indeed a restart is required.
git-svn-id: http://munki.googlecode.com/svn/trunk@253 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 23:26:05 +00:00
Greg Neagle e3c4198db3 Added support for hiding and showing the main MunkiStatus window.
git-svn-id: http://munki.googlecode.com/svn/trunk@252 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:07:26 +00:00
Greg Neagle 19edc0df5d Managed Software Update.app
Fixed typo in "Logout Recommended" message
Made sure if AppleUpdates required a restart that logout was required.

git-svn-id: http://munki.googlecode.com/svn/trunk@251 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:06:31 +00:00
Greg Neagle 2412154c7a Changes to munkistatus.py:
Looks for an existing running version of MunkiStatus before trying to launch MunkiStatus.
New hide() and show() functions to hide and show the MunkiStatus window.

git-svn-id: http://munki.googlecode.com/svn/trunk@250 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-13 22:03:37 +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 68c78c0ebe Fixed a typo in the new support for 'maximum_os_version'
git-svn-id: http://munki.googlecode.com/svn/trunk@247 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 23:13:51 +00:00
Greg Neagle 20f97877fd updatecheck.py: Added support for "maximum_os_version" key in pkginfo
git-svn-id: http://munki.googlecode.com/svn/trunk@246 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 23:07:29 +00:00
Greg Neagle 516d7d75f3 Add filepath to exception raised in readPlist when it's a bad plist file.
git-svn-id: http://munki.googlecode.com/svn/trunk@245 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:02:40 +00:00
Greg Neagle 96251a968e Fix in special-case processing of Microsoft Office 2008 packages on Snow Leopard.
git-svn-id: http://munki.googlecode.com/svn/trunk@244 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:01:14 +00:00
Greg Neagle 9bcc50a325 Smarter handling of malformed Info.plists in packages. Instead of throwing an exception, return pkginfo describing the problem.
git-svn-id: http://munki.googlecode.com/svn/trunk@243 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-02 22:00:17 +00:00
Greg Neagle 33e0d69436 Fixed bug in munkicommon.getExtendedVersion() that could return None instead of "0.0.0.0.0".
git-svn-id: http://munki.googlecode.com/svn/trunk@242 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-10-01 23:49:20 +00:00
Greg Neagle 491345a1c0 MunkiStatus.app: Fixed stupid typo when loading /System/Library/CoreServices/DefaultDesktop.jpg and added a little more error handling around this. This bug caused MunkiStatus to not appear over the loginwindow if a custom loginwindow background picture had not been set. Bumped version to 2.0.1.
git-svn-id: http://munki.googlecode.com/svn/trunk@241 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-29 19:48:59 +00:00
Greg Neagle c200650623 Tweaked munkistatus output.
git-svn-id: http://munki.googlecode.com/svn/trunk@240 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-29 17:51:27 +00:00
Greg Neagle c61024cba0 Another tweak to improve visual behavior when activating the main window.
git-svn-id: http://munki.googlecode.com/svn/trunk@239 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-29 17:32:06 +00:00
Greg Neagle 1d6996c38f More tweaks to the code that runs managedsoftwareupdate --manual to do a manual check for updates when the user launches the app. Bumped version to 1.2.
git-svn-id: http://munki.googlecode.com/svn/trunk@238 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-29 17:18:20 +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 299abe4f1c Flipped the order receipts are checked: we were checking the legacy /Library/Receipts first, then asking pkgutil. Now we go the other way.
git-svn-id: http://munki.googlecode.com/svn/trunk@236 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-28 23:00:01 +00:00
Greg Neagle b3edba0a7a Fixed unicode handling when sending messages to MunkiStatus.app
git-svn-id: http://munki.googlecode.com/svn/trunk@235 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-28 22:58:38 +00:00
Greg Neagle 5ddacb31ff Revised the logic when running managedsoftwareupdate --manual to get "better" behavior when checking for updates manually.
git-svn-id: http://munki.googlecode.com/svn/trunk@232 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-28 17:24:32 +00:00
Greg Neagle 5b438a55b7 Replaced installer image in MunkiStatus window with the MunkStatus icon; appearance tweaks; removed minimize button from the MunkiStatus window.
git-svn-id: http://munki.googlecode.com/svn/trunk@231 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 23:56:11 +00:00
Greg Neagle 5a471d591b Removed some temporary testing code.
git-svn-id: http://munki.googlecode.com/svn/trunk@230 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 22:48:34 +00:00
Greg Neagle f746a280ac Updated copyright and licensing info for Apache 2.0 license.
git-svn-id: http://munki.googlecode.com/svn/trunk@229 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 22:30:27 +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 2ef39d8d79 Still trying to get all these changes uploaded...
git-svn-id: http://munki.googlecode.com/svn/trunk@227 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 22:22:52 +00:00
Greg Neagle 00680f71dc git-svn-id: http://munki.googlecode.com/svn/trunk@226 a4e17f2e-e282-11dd-95e1-755cbddbdd66 2009-09-25 22:12:24 +00:00
Greg Neagle 045ead22d4 Rewrite of MunkiStatus.app as Cocoa-Python app.
git-svn-id: http://munki.googlecode.com/svn/trunk@225 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-25 22:09:21 +00:00
Greg Neagle f2f90c3f6d Updated manifest examples to match the new behavior of updatecheck.py (where an included manifest can use the catalog list of its parent manifest)
git-svn-id: http://munki.googlecode.com/svn/trunk@222 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-23 21:01:06 +00:00
Greg Neagle 635895a3b3 Changed processManifestForInstalls() to take an optional list of catalogs to search if the manifest has no list of catalogs.
git-svn-id: http://munki.googlecode.com/svn/trunk@220 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-23 19:02:04 +00:00
Greg Neagle 89d6d06dfe Code cleanup; removing more commented-out code...
git-svn-id: http://munki.googlecode.com/svn/trunk@219 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 15:18:02 +00:00
Greg Neagle 7556630385 - Fixed parsing of flat packages so that you can pass relative paths to makepkginfo
- Changed getBundlePackageInfo() to try to find subpackages and query them directly instead of using info from the .dist file.  This causes different version info to be returned and makes makepkginfo return version info that agrees with what pkgutil on Snow Leopard stores.

git-svn-id: http://munki.googlecode.com/svn/trunk@218 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 00:09:29 +00:00
Greg Neagle 5ee78c30ef Backed out a change in how updatecheck compared a package to be installed to info retrieved from pkgutil now that I better understand how pkgutil in Snow Leopard stores version info from non-flat packages.
git-svn-id: http://munki.googlecode.com/svn/trunk@217 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 00:05:30 +00:00
Greg Neagle b71e17991b Removed commented-out lines as part of a general cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@216 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 00:03:11 +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 4872ce7776 Removed commented out lines as part of a general cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@214 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-17 00:01:37 +00:00
Greg Neagle 6d1d3e598c More pkginfo examples - added iLife '09 examples.
git-svn-id: http://munki.googlecode.com/svn/trunk@213 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-16 23:59:52 +00:00
Greg Neagle 681a05e5db Changed getFlatPackageInfo so it looks for a PackageInfo file at the top level of the expanded xar archive. Failing that, it looks for PackageInfo files in embedded sub-packages at the top level of the the expanded xar archive. If that still comes up empty, it tries to get info from the Distribution file at the top level of the expanded xar archive.
git-svn-id: http://munki.googlecode.com/svn/trunk@212 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-15 03:52:01 +00:00
Greg Neagle 97afbb6e5e More unicode fixes. Sigh.
git-svn-id: http://munki.googlecode.com/svn/trunk@211 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 23:17:57 +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 75a1f96f9f 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...
Added support for CFBundleVersion when CFBundleShortVersionString is missing.

git-svn-id: http://munki.googlecode.com/svn/trunk@209 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:51:32 +00:00
Greg Neagle 3af81c7dcf 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@208 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:50:36 +00:00
Greg Neagle 8c92d2e679 Support for CFBundleVersion if CFBundleShortVersionString is missing.
git-svn-id: http://munki.googlecode.com/svn/trunk@207 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:50:06 +00:00
Greg Neagle c682eaa717 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...
Unicode fixes.

Fixed handling of the install path - some receipts record this with a trailing slash, some do not. If there was no trailing slash, the final filesystem item path was incorrect.

git-svn-id: http://munki.googlecode.com/svn/trunk@206 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:48:50 +00:00
Greg Neagle d3be6d71e6 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@205 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:47:09 +00:00
Greg Neagle e91f3a5f67 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...
Support for CFBundleVersion when CFBundleShortVersionString is missing.

git-svn-id: http://munki.googlecode.com/svn/trunk@204 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:46:42 +00:00
Greg Neagle 89239f7f14 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...
Some unicode fixes.

git-svn-id: http://munki.googlecode.com/svn/trunk@203 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:45:44 +00:00
Greg Neagle 4440a121be 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@202 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-09-14 16:45:02 +00:00
Greg Neagle 99efc6ed01 Fixed os version comparison; "10.6" was comparing as less than "10.6.0".
Fixed a problem in processRemoval() when using a method other than removepackages.


git-svn-id: http://munki.googlecode.com/svn/trunk@201 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-31 23:30:16 +00:00
Greg Neagle ca3e0a2f06 Fixed typo in code added to shouldRebuildDB() to look at new receipts location in Snow Leopard.
git-svn-id: http://munki.googlecode.com/svn/trunk@200 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-31 21:26:48 +00:00
Greg Neagle 87c5cf446d Missed a few name changes when moving from pkgdata['pkg_refcount'] to pkgdata['pkg_references'].
git-svn-id: http://munki.googlecode.com/svn/trunk@199 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-31 20:30:23 +00:00