Commit Graph

400 Commits

Author SHA1 Message Date
Greg Neagle
ba8d9448cc Changed unmountdmg back to using subprocess.Popen from an earlier change to subprocess.call so that we can capture the output instead of it going to stdout.
git-svn-id: http://munki.googlecode.com/svn/trunk@652 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 17:24:25 +00:00
Greg Neagle
e7ad493e61 pylint cleanups.
git-svn-id: http://munki.googlecode.com/svn/trunk@651 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 17:20:00 +00:00
Greg Neagle
ec778c94c2 pylint cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@650 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 06:26:49 +00:00
Greg Neagle
49775e2194 pylint cleanup.
git-svn-id: http://munki.googlecode.com/svn/trunk@649 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 06:07:24 +00:00
Greg Neagle
4344b472c8 pylint cleanups
git-svn-id: http://munki.googlecode.com/svn/trunk@648 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 04:03:06 +00:00
Greg Neagle
fdacc775b1 pylint cleanups
git-svn-id: http://munki.googlecode.com/svn/trunk@647 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-04 03:39:45 +00:00
Greg Neagle
dcac138517 pylint cleanups
git-svn-id: http://munki.googlecode.com/svn/trunk@646 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-03 23:59:07 +00:00
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
7c539c00ac Explicitly copy "$munkiroot"/code/client/munkilib/*.py ./usr/local/munki/munkilib/
git-svn-id: http://munki.googlecode.com/svn/trunk@642 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-08-02 20:47:36 +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
c98c9f802b Initial commit.
git-svn-id: http://munki.googlecode.com/svn/trunk@612 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-28 17:00:30 +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
9a47af9605 Changes to eliminate "WebKit Threading Violation" errors from the log; now use self.performSelectorOnMainThread_withObject_waitUntilDone_ to make sure the description is updated on the main thread.
git-svn-id: http://munki.googlecode.com/svn/trunk@602 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-23 17:39:46 +00:00
Greg Neagle
60ba21297e Added some tools; three packaging tools and a tool to generate choicesXML files.
git-svn-id: http://munki.googlecode.com/svn/trunk@601 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-23 16:50:22 +00:00
Greg Neagle
8cf50e6b51 Fixed handling of plain text descriptions so that line breaks and other whitespace is displayed properly.
Fixed bogus "You software is up to date" alert when there were Apple Software Updates to install.

git-svn-id: http://munki.googlecode.com/svn/trunk@600 a4e17f2e-e282-11dd-95e1-755cbddbdd66
2010-07-22 22:38:52 +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