Commit Graph

218 Commits

Author SHA1 Message Date
Greg Neagle 83ed22f3af installer.py: new copyFromDMG method that copies an arbitrary list of items from a mounted DMG to specified locations.
New removeCopiedItems method that removes the same list of items from the startup disk.


updatecheck.py: support for new copy_from_dmg and remove_copied_items methods.

makepkginfo: support for making pkginfo with new copy_from_dmg method,

git-svn-id: http://munki.googlecode.com/svn/trunk@603 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-26 23:26:25 +00:00
Greg Neagle c5011e04c5 Undo last revision; do not flag parsed description as text/html.
git-svn-id: http://munki.googlecode.com/svn/trunk@599 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-22 22:31:54 +00:00
Greg Neagle 5bc923e512 Speed up install check by processing all installed packages at once, instead of one at a time. This leverages getInstalledPackages(), which we earlier sped up for processing managed_uninstalls.
git-svn-id: http://munki.googlecode.com/svn/trunk@598 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-22 22:00:51 +00:00
Greg Neagle 8856037809 Flag descriptions parsed from dist files as text/html so we can distinguish them from plain text descriptions.
git-svn-id: http://munki.googlecode.com/svn/trunk@597 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-22 21:58:29 +00:00
Greg Neagle 5efa8ad816 Fixed version number returned by munkicommon.get_version().
git-svn-id: http://munki.googlecode.com/svn/trunk@595 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 20:10:28 +00:00
Greg Neagle db3f6bc41d updatecheck.py -- New approach to importing installed packages - big speedup when processing managed_uninstalls.
New support for optional software installs. 

git-svn-id: http://munki.googlecode.com/svn/trunk@591 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:10:00 +00:00
Greg Neagle 6d83d3354e removepackages.py: updated copyright info, better exception handling on package/bom import
git-svn-id: http://munki.googlecode.com/svn/trunk@590 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:07:37 +00:00
Greg Neagle e5913ed103 munkistatus.py: updated copyright info, new socket timeout code; updated for new Managed Software Update.app
git-svn-id: http://munki.googlecode.com/svn/trunk@589 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:06:19 +00:00
Greg Neagle 2eb399db10 Updated copyright info; removed unused import
git-svn-id: http://munki.googlecode.com/svn/trunk@588 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:04:42 +00:00
Greg Neagle 99a512341b installer.py: updated copyright info, removed unused import, new message when done copying from disk image.
git-svn-id: http://munki.googlecode.com/svn/trunk@587 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:04:03 +00:00
Greg Neagle 7fe6e08583 FoundationPlist: updated copyright info
git-svn-id: http://munki.googlecode.com/svn/trunk@586 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:02:47 +00:00
Greg Neagle f89b44f0c4 appleupdates: updated copyright info; removed unused import
git-svn-id: http://munki.googlecode.com/svn/trunk@585 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:02:10 +00:00
Greg Neagle 7ed8902807 Updated for Photoshop CS5 12.0.1 updater
git-svn-id: http://munki.googlecode.com/svn/trunk@572 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-06 19:00:06 +00:00
Greg Neagle 819335c316 Bug fix for CS3 removal (modulename carried over from move of code from installer.py to adobeutils.py)
git-svn-id: http://munki.googlecode.com/svn/trunk@553 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-21 18:24:47 +00:00
Greg Neagle fa860b71ef More Adobe CS5 support.
git-svn-id: http://munki.googlecode.com/svn/trunk@552 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-21 17:42:30 +00:00
Greg Neagle 3f35305a42 More CS5 changes. Now handle the AdobePatchInstaller included with CS5 updates.
git-svn-id: http://munki.googlecode.com/svn/trunk@551 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-18 22:24:47 +00:00
Greg Neagle d80f79e4f4 Better error checking when parsing old-style .info files.
git-svn-id: http://munki.googlecode.com/svn/trunk@550 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-08 21:08:16 +00:00
Greg Neagle 479203fecc Fixes an issue where a bad CatalogURL for Apple Software Update would cause an unhandled exception in appleupdates.py.
Better exception handling in managedsoftwareupdate.

git-svn-id: http://munki.googlecode.com/svn/trunk@548 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-08 17:25:15 +00:00
Greg Neagle 3e4e371d68 More changes to better support the really old package format used by the CiscoVPN and Citrix ICA Client packages. Bleh.
git-svn-id: http://munki.googlecode.com/svn/trunk@546 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-03 18:28:38 +00:00
Greg Neagle 2ab043af4e Better support for older package formats that are missing Info.plist files.
git-svn-id: http://munki.googlecode.com/svn/trunk@545 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-02 23:44:38 +00:00
Greg Neagle afc0f5b6a8 Removed several unused functions.
git-svn-id: http://munki.googlecode.com/svn/trunk@544 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-02 22:08:50 +00:00
Greg Neagle 01fabd0bf8 More changes to prep for CS5 deployment.
git-svn-id: http://munki.googlecode.com/svn/trunk@543 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-02 22:04:18 +00:00
Greg Neagle 00c1eb8fb6 Removed legacy HTTP code that was replaced by curl.
Added new ManifestException class so we can throw an exception when we retrieve an invalid manifest (plist not valid).

git-svn-id: http://munki.googlecode.com/svn/trunk@542 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-02 22:03:18 +00:00
Greg Neagle ccd1635a80 Fix to removepackages.py to properly import pkg data from pkgutil database under Snow Leopard when there are items in /Library/Receipts/boms, presumably left over from Leopard.
git-svn-id: http://munki.googlecode.com/svn/trunk@541 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-01 16:47:45 +00:00
Greg Neagle cad13c0fd7 Start of changes to support Adobe CS5 deployment.
git-svn-id: http://munki.googlecode.com/svn/trunk@539 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-05-26 17:03:28 +00:00
Greg Neagle cdc0ef777f Added ipconfig waitall for startup runs.
checkandinstallatstartup now does not clear its flag until there's nothing to do; it will run, install and restart until there is nothing to do.

git-svn-id: http://munki.googlecode.com/svn/trunk@538 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-05-25 22:20:45 +00:00
Greg Neagle 5350042f4d Fixes to deal with manifests that list non-existent catalogs
git-svn-id: http://munki.googlecode.com/svn/trunk@537 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-05-18 15:45:18 +00:00
Greg Neagle a6edacfcdd Bumped version number to 0.5.1.
git-svn-id: http://munki.googlecode.com/svn/trunk@533 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-04-28 17:39:38 +00:00
Greg Neagle c493aa363b Fixed problem getting updated primary manifest introduced by r523.
Fixed problem generating list of needed cache items introduced by r523.

git-svn-id: http://munki.googlecode.com/svn/trunk@532 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-04-27 23:04:33 +00:00
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 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 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 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 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 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