Commit Graph

331 Commits

Author SHA1 Message Date
Greg Neagle
ba1f9f823f pylint cleanups
git-svn-id: http://munki.googlecode.com/svn/trunk@645 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-03 23:42:09 +00:00
Greg Neagle
74bc912929 New comment.
git-svn-id: http://munki.googlecode.com/svn/trunk@644 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-03 22:06:22 +00:00
Greg Neagle
9de06a2b75 Cleaned up/simplified the Adobe log processing used to generate progress info.
git-svn-id: http://munki.googlecode.com/svn/trunk@643 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-03 21:26:27 +00:00
Greg Neagle
d36e29927f Updated build number for get_version
git-svn-id: http://munki.googlecode.com/svn/trunk@640 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-02 20:17:41 +00:00
Greg Neagle
867675fb8c Updated build number in get_version
git-svn-id: http://munki.googlecode.com/svn/trunk@639 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-02 20:17:09 +00:00
Greg Neagle
33c986b226 Updated help text for makepkginfo.
git-svn-id: http://munki.googlecode.com/svn/trunk@637 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-02 18:48:03 +00:00
Greg Neagle
92c8b8c458 pylint-inspired cleanups.
Pull some restart logic from adobeutils.py (where it was getting lost) back into this module.

git-svn-id: http://munki.googlecode.com/svn/trunk@633 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 22:08:53 +00:00
Greg Neagle
b36f12b36c pylint inspired cleanups.
git-svn-id: http://munki.googlecode.com/svn/trunk@632 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 22:07:15 +00:00
Greg Neagle
a2e227d18f Move restart logic out of this module and back into installer.py
When building installs items for use with makepkginfo, skip Language Packs.

git-svn-id: http://munki.googlecode.com/svn/trunk@631 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 22:06:10 +00:00
Greg Neagle
7c6102dd5d pylint-inspired cleanup.
Add support for copy_local key in pkginfo/installinfo so adobeutils can work around AdobePatchInstaller issues.

git-svn-id: http://munki.googlecode.com/svn/trunk@629 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 00:04:17 +00:00
Greg Neagle
6e9cc3d21e Since adobeutils.py can now sometimes delete the diskimage file before it returns to installer.py, add a check to make sure the diskimage file exists before we try to remove it.
git-svn-id: http://munki.googlecode.com/svn/trunk@628 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 00:02:41 +00:00
Greg Neagle
d017f8be80 runAdobeCS5PatchInstaller can now optionally copy the dmg contents to the local disk before install to work around a bug in the AdobePatchInstaller.
add
<key>copy_local</key>
<true/>

to the relevant pkginfo.

git-svn-id: http://munki.googlecode.com/svn/trunk@627 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-30 00:01:10 +00:00
Greg Neagle
13d151847b Reorganization and minor edits to make pylint a bit happier.
git-svn-id: http://munki.googlecode.com/svn/trunk@626 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 23:58:13 +00:00
Greg Neagle
88e2969d95 adobeutils.getAdobeCatalogInfo (used my makepkginfo) now generates installs items for CS5 updates, based on payload information.
git-svn-id: http://munki.googlecode.com/svn/trunk@624 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 19:41:08 +00:00
Greg Neagle
e95ce9d3b3 Various minor edits to make pylint happier.
git-svn-id: http://munki.googlecode.com/svn/trunk@622 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 17:36:38 +00:00
Greg Neagle
4f7de426a0 Assign maxversion before using it in a comparison.
Fix typo: 'cadir' should be 'capath'

git-svn-id: http://munki.googlecode.com/svn/trunk@620 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 14:26:26 +00:00
Greg Neagle
de4d656bca Replaced (old) use of 'pkgname' a few places with (new) options.pkgname.
git-svn-id: http://munki.googlecode.com/svn/trunk@619 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 14:20:03 +00:00
Greg Neagle
7b03fdf353 Eliminate variables named "version" in a few places as they were conflicting with distutils.version...
git-svn-id: http://munki.googlecode.com/svn/trunk@615 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-29 05:18:01 +00:00
Greg Neagle
03cd5fd55c Removed --installxml, --uninstallxml and --serialnumber options from makepkginfo since we're no longer supporting CS5 installs that aren't processed with AAMEE.
git-svn-id: http://munki.googlecode.com/svn/trunk@614 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-28 23:57:34 +00:00
Greg Neagle
f7595cb979 Added support for installing Adobe CS5 products packaged with AAMEE tool. Removed support for "naked" (unpackaged) CS5 installs.
-appdmg flag to makepkginfo causes it to make old-style appdmg info if appropriate.

git-svn-id: http://munki.googlecode.com/svn/trunk@613 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-28 23:54:38 +00:00
Greg Neagle
7df737f77c in getInstalledPackages, make sure we aren't storing empty version numbers; store "0.0.0.0.0" instead. (distutils.version.LooseVersion throws an exception when given an empty string.)
git-svn-id: http://munki.googlecode.com/svn/trunk@611 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-28 15:55:02 +00:00
Greg Neagle
fe1b86e46a Change so SuppressAutoInstall will not suppress a checkandinstallatstartup run.
git-svn-id: http://munki.googlecode.com/svn/trunk@610 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 23:18:52 +00:00
Greg Neagle
f020f400f1 Cache the paths to downloaded manifests so that we only request them once per managedsoftwareupdate session.
git-svn-id: http://munki.googlecode.com/svn/trunk@609 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 18:59:49 +00:00
Greg Neagle
00cb701119 Log when we kill the loginwindow.
git-svn-id: http://munki.googlecode.com/svn/trunk@608 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 17:17:19 +00:00
Greg Neagle
cd35984e7c Changed checkandinstallatstartup logic to restart the loginwindow if we've performed updates but haven't restarted.
git-svn-id: http://munki.googlecode.com/svn/trunk@607 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 17:15:10 +00:00
Greg Neagle
bdd0f8e603 Add support for new preferences "SuppressUserNotification" and "SuppressAutoInstall".
SuppressUserNotification prevents munki from notifying a logged-in user of available updates.

SuppressAutoInstall prevents munki from automatically installing when at the loginwindow.

git-svn-id: http://munki.googlecode.com/svn/trunk@606 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 16:47:36 +00:00
Greg Neagle
4ca006dc99 Fixed call to copyAppFromDMG() to revert to original behavior.
git-svn-id: http://munki.googlecode.com/svn/trunk@605 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-27 16:06:34 +00:00
Greg Neagle
5bfe5efbe6 Fix for setting mode on items copied from DMG; more detail in log on setting owner/group/mode
git-svn-id: http://munki.googlecode.com/svn/trunk@604 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-26 23:40:07 +00:00
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
194f2466a5 Fix so postflight script doesn't get run twice.
git-svn-id: http://munki.googlecode.com/svn/trunk@596 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 21:49:25 +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
5cf6381db7 Changes to work with new version of Managed Software Update.app
git-svn-id: http://munki.googlecode.com/svn/trunk@584 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 03:00:55 +00:00
Greg Neagle
67c7d092db makepkginfo: CS5 changes
git-svn-id: http://munki.googlecode.com/svn/trunk@583 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 02:59:44 +00:00
Greg Neagle
60d864cf29 Updated copyright info for makecatalogs
git-svn-id: http://munki.googlecode.com/svn/trunk@582 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 02:58:39 +00:00
Greg Neagle
cd6cb143f7 Changed launchapp to just pass all additional arguments to /usr/bin/open
git-svn-id: http://munki.googlecode.com/svn/trunk@581 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-21 02:56:47 +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
941a48aae1 Changed the network up check when running at startup.
git-svn-id: http://munki.googlecode.com/svn/trunk@570 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-01 21:46:25 +00:00
Greg Neagle
7f8261ea99 Call recordUpdateCheckResult() when preflight script aborts the managedsoftware update run.
git-svn-id: http://munki.googlecode.com/svn/trunk@559 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-06-22 17:59:30 +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