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
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
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
Greg Neagle
6752545fd6
Refactored processInstall() and download_installeritem() so that quoted URLs are maintained separately from file system paths - i.e., an installer item named "Hello World.dmg" would be downloaded as "Hello Wolrd.dmg" and not "Hello%20World.dmg".
...
git-svn-id: http://munki.googlecode.com/svn/trunk@198 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-31 17:34:00 +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
64edbdd6ae
Added warning message (which will normally go only to the log) when removing non-empty bundles.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@195 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-28 18:19:18 +00:00
Greg Neagle
6ca682ec52
Added debug info to removal processing where packages to be removed are being selected.
...
Added urllib2.quote() to several of the HTTP download requests to correctly process installer items, catalogs, and manifests that have URL-reserved characters (like spaces!)
git-svn-id: http://munki.googlecode.com/svn/trunk@194 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-28 18:18:14 +00:00
Greg Neagle
b56d53bc94
Post 10.5.X fix: munkicommon.pythonScriptRunning() now correctly determines if another instance of the given script is running. (This broke in a post-Leopard release)
...
getManagedInstallPrefs() now writes out a 'default' preferences file to /Library/Preferences/ManagedInstalls.plist if the file doesn't exist.
getManagedInstallPrefs() now writes an error message to the log and raises an exception if it can't read the prefs file.
git-svn-id: http://munki.googlecode.com/svn/trunk@190 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-27 16:35:50 +00:00
Greg Neagle
bc34da0157
Fixed formatting errors on removal error messages.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@188 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-26 23:31:14 +00:00
Greg Neagle
d2cf7bf89b
Some post-Leopard changes/tweaks, fixed a UTF-8- issue when working with paths from the pkginfo database, and bumped down the verbosity when importing package data from the pkginfo database.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@186 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 22:42:01 +00:00
Greg Neagle
87597f4d07
Fixed installer's percentage-done output for post-Leopard.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@184 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 17:37:19 +00:00
Greg Neagle
c10965b059
Fixed indentation error on lines 157 and 158.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@183 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 16:33:38 +00:00
Greg Neagle
48b4aee1b2
Changes to better deal with the Leopard+ package database, which does not always preserve the full five-part version number.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@182 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 16:18:25 +00:00
Greg Neagle
802acfc376
Changes to getInstalledPackageVersion(pkgid) to deal with Leopard and later's package database, which does not always preserve the full five-part version number.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@181 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 16:17:05 +00:00
Greg Neagle
8b512d7351
Added Apache License info.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@180 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-25 16:14:47 +00:00
Greg Neagle
5e875ece1c
Added encode('UTF-8') to a log message to work around an issue when the package name as returned by /usr/sbin/installer -pkginfo is a Unicode string (or some accurately, contains unicode characters). This points up a possible issue all throughout the code as far as ASCII vs Unicode string handling.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@179 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-24 18:53:03 +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
3c84b536f9
Removed warning when /Library/Preferences/ManagedPreferences.plist is missing as it caused a chicken and the egg problem...
...
git-svn-id: http://munki.googlecode.com/svn/trunk@177 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-24 16:55:44 +00:00
Greg Neagle
527a28d083
Fixed typo in getExtendedVersion created when converting from plistlib to FoundationPlist.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@176 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-21 22:29:53 +00:00
Greg Neagle
b60b7dcce0
Fixed getManagedInstallPrefs() to actually read the preferences file (broke it in last commit).
...
git-svn-id: http://munki.googlecode.com/svn/trunk@175 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-21 21:48:13 +00:00
Greg Neagle
445962ec20
Updated makepkginfo to use munkilib/FoundationPlist.py instead of plistlib.
...
git-svn-id: http://munki.googlecode.com/svn/trunk@174 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2009-08-20 17:56:12 +00:00