mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-03-14 05:21:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
618 Commits 12 Branches 118 Tags
01bbf73ef23872b7d64298e842ec0ad839931d49
Commit Graph

472 Commits

Author SHA1 Message Date
Greg Neagle
01bbf73ef2 Typo fix in updatecheck.py; 
munkicommon - in display_warning and display_error, make sure it is a string that is appended to report['Warnings'] or report['Errors']

git-svn-id: http://munki.googlecode.com/svn/trunk@919 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-18 16:38:44 +00:00
Greg Neagle
3a18a9fd9e installer.py: account for case where no valid installer item is found on a disk image 
updatecheck.py: provide more feedback when pkg items are rejected due to incompatible os or architecture.

git-svn-id: http://munki.googlecode.com/svn/trunk@918 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-17 21:57:21 +00:00
Greg Neagle
a7cc6e5457 Alter debug output when comparing OS version and architecture. 
git-svn-id: http://munki.googlecode.com/svn/trunk@915 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-15 18:40:16 +00:00
Greg Neagle
149715226a installs/removals that are skipped during forced_* operations are rewritten to InstallInfo.plist so they can be done with user approval. installer items in /Library/Managed Installs/Cache/ are not removed if needed by skipped installs. 
git-svn-id: http://munki.googlecode.com/svn/trunk@912 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-12 19:20:04 +00:00
MagerValp
33ffe3bffb Handle installer -query failing when makepkginfo analyzes a pkg on a network volume. Assumes that the charset is UTF-8, which probably needs to be fixed. 
git-svn-id: http://munki.googlecode.com/svn/trunk@911 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-12 15:05:34 +00:00
Greg Neagle
e4bc10aedd Managed Software Update.app now warns if any blocking apps are running if the user chooses to update without logging out. 
git-svn-id: http://munki.googlecode.com/svn/trunk@910 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-12 00:35:46 +00:00
Greg Neagle
74f5ce6d50 installer.py: consider list of installs for blocking applications only if no 'blocking_applications' key in pkginfo. 
git-svn-id: http://munki.googlecode.com/svn/trunk@909 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-11 23:27:13 +00:00
Greg Neagle
cb4cff3c1e Fix for edge case where item is in SelfServeManifest to be installed, but in another manifest for removal. Previously, item would be uninstalled, then reinstalled, then uninstalled... Now it's uninstalled and the entry in SelfServeManifest is ignored. 
git-svn-id: http://munki.googlecode.com/svn/trunk@908 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-11 22:24:39 +00:00
Greg Neagle
9f3f02d879 Faster, simpler method of determining if an app is running for use with blocking_applications; this also finds running Carbon/CFMApp applications... 
git-svn-id: http://munki.googlecode.com/svn/trunk@907 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-11 00:38:40 +00:00
John Randolph
44d2ab28ab fix typo in MSUAppDelegate 
prevent curl from using non-authenticated anon DH cipher types, 
  e.g. TLS_DH_anon_WITH_AES_256_CBC_SHA

(seems that curl --ciphers HIGH selects high # bit ciphers, but
not necessarily only secure ones)



git-svn-id: http://munki.googlecode.com/svn/trunk@899 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-10 19:27:54 +00:00
Greg Neagle
87036833e1 Added support for blocking_applications that cause a forced_install or forced_uninstall to be skipped if any application in the list is running. 
git-svn-id: http://munki.googlecode.com/svn/trunk@898 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-10 01:00:44 +00:00
Greg Neagle
849c79d041 Print better error messages when repo path is missing expected directories. 
git-svn-id: http://munki.googlecode.com/svn/trunk@894 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-08 17:39:28 +00:00
Greg Neagle
486af91aa5 Use cp -pR when copying from a disk image to preserve creation and modification times, etc. If user, group or mode are not specified, default to "root", "admin", and "o-w" respectively. 
git-svn-id: http://munki.googlecode.com/svn/trunk@893 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-08 17:36:54 +00:00
Greg Neagle
6334f35c6f Revert to Python pre-2.6 try/except format, since the new 2.6+ format breaks under Leopard, which uses Python 2.5.x by default. 
git-svn-id: http://munki.googlecode.com/svn/trunk@892 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-06 19:28:47 +00:00
Greg Neagle
fbeaadbe48 Change shebang to use installed Python, not environment's Python. 
git-svn-id: http://munki.googlecode.com/svn/trunk@887 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-03 00:03:04 +00:00
John Randolph
f4dc95a10d Add --ciphers HIGH to limit curl ssl ciphers usage 
as discussed previously in 
http://code.google.com/p/munki/issues/detail?id=40



git-svn-id: http://munki.googlecode.com/svn/trunk@886 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-11-02 21:33:40 +00:00
Greg Neagle
595cc334cd Fix for unicode characters in pkg name or description 
git-svn-id: http://munki.googlecode.com/svn/trunk@885 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-29 21:17:48 +00:00
Greg Neagle
3db9b52cda Minor docstring and output tweaks. 
git-svn-id: http://munki.googlecode.com/svn/trunk@882 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-28 18:59:57 +00:00
Greg Neagle
6045ae8516 munkiimport now optionally runs makecatalogs after importing an installer item 
git-svn-id: http://munki.googlecode.com/svn/trunk@879 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-27 23:57:09 +00:00
Greg Neagle
4c4f34d064 makePkgInfo() now uses the makepkginfo in the same directory as munkiimport if it exists. 
git-svn-id: http://munki.googlecode.com/svn/trunk@878 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-27 22:05:58 +00:00
Greg Neagle
0ed9cb744d Better handle the case where the install item path is in repo/pkgs/. 
git-svn-id: http://munki.googlecode.com/svn/trunk@877 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-27 21:58:08 +00:00
Greg Neagle
7233ea384c Fix for downloading uninstaller items as supported for Adobe CS4 uninstalls. This was accidentally broken during the optimization of package integrity checking (so it was my fault, not Justin's!) 
git-svn-id: http://munki.googlecode.com/svn/trunk@875 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-27 20:38:11 +00:00
Greg Neagle
ab2118c3ed Additional debugging messages in updatecheck; record items that are managed_updates to avoid items disappearing from the optional_installs list if they are also in managed_updates. 
git-svn-id: http://munki.googlecode.com/svn/trunk@874 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 23:45:03 +00:00
Greg Neagle
7e9f255085 Fixed idle check logic when running in 'checkandinstallatstartup' mode. 
git-svn-id: http://munki.googlecode.com/svn/trunk@872 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 20:38:27 +00:00
MagerValp
54a32d304d Added dummy svnversion file so that munkitools run straight from svn returns "0.7.0.svn.0". 
git-svn-id: http://munki.googlecode.com/svn/trunk@870 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 20:06:03 +00:00
Greg Neagle
b901118418 Fix doc string formatting. 
Re-check idle time when running in "checkandinstallatstartup" mode so we maximize our chances of getting all the updates done when bootstrapping.

git-svn-id: http://munki.googlecode.com/svn/trunk@869 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 18:52:06 +00:00
Justin McWilliams
099112f56e Fixing mistakes introduced in r865 for warning output on lines 462 and 667. 
git-svn-id: http://munki.googlecode.com/svn/trunk@867 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 17:25:33 +00:00
Justin McWilliams
7afec5b605 Better implementation of r863; move verifyFileOnlyWritableByMunkiAndRoot() and runExternalScript() to new munkilib utils module that is 100% free of ObjC-dependant Python. 
git-svn-id: http://munki.googlecode.com/svn/trunk@865 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 16:32:48 +00:00
Greg Neagle
963c5c319b Fix a too-long line in updatecheck.py 
git-svn-id: http://munki.googlecode.com/svn/trunk@864 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 15:35:07 +00:00
Justin McWilliams
93adfde71f managedsoftwareupdate: 
- if import of Python module with ObjC binding fails, call "report_broken_client" script where admins can setup desired reporting/notification.


git-svn-id: http://munki.googlecode.com/svn/trunk@863 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 13:49:40 +00:00
Justin McWilliams
aacad21154 verifyFileOnlyWritableByMunkiAndRoot() 
For gid verification, instead of only checking file gid to match current user oir hardcoded 80, check current user's gid, admin's gid, and wheel's gid all dynamically looked up.


git-svn-id: http://munki.googlecode.com/svn/trunk@862 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 13:24:06 +00:00
Justin McWilliams
9a566d108e Move verifyFileOnlyWritableByMunkiAndRoot() from munkicommon to managesoftwareupdate, so it can be used without importing munkicommon.py. 
This is in prep of a upcoming notification feature that cannot depend on ObjC Py bindings.  Alternatively, if we want to share such code, we can create a common/util module for only Pure-Python code, and doc that it should not contain any ObjC imports.


git-svn-id: http://munki.googlecode.com/svn/trunk@861 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 13:15:13 +00:00
Greg Neagle
331813da86 get_version() now looks for and reads two files in the munkilib directory: 
version.plist
svnversion

git-svn-id: http://munki.googlecode.com/svn/trunk@859 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 05:21:54 +00:00
Greg Neagle
91ba0a4af2 New munkilib/version.plist to keep track of the version. 
git-svn-id: http://munki.googlecode.com/svn/trunk@858 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-26 05:20:07 +00:00
Greg Neagle
c682755898 Fix for missing LastSuccessfulDate in /Library/Preferences/com.apple.SoftwareUpdate.plist 
git-svn-id: http://munki.googlecode.com/svn/trunk@857 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 19:01:49 +00:00
Greg Neagle
775f592608 New softwareUpdatePrefs() function to replace all the calling out to "defaults read" 
git-svn-id: http://munki.googlecode.com/svn/trunk@856 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 18:45:58 +00:00
Greg Neagle
d693e7ac4b For optional installs, if there is not enough disk space to install the item, do not display a warning so we don't get spurious warnings in ManagedSoftwareUpdateReport.plist 
git-svn-id: http://munki.googlecode.com/svn/trunk@855 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 17:41:53 +00:00
John Randolph
be912bca2f merge finalized branch /get-apps-nfs-detect into trunk 
git-svn-id: http://munki.googlecode.com/svn/trunk@854 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 17:23:23 +00:00
MagerValp
99037fe71d munkicommon.format_time() updated to use Foundation.NSDate(). 
git-svn-id: http://munki.googlecode.com/svn/trunk@853 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 16:09:58 +00:00
MagerValp
35563cb6e0 Changed ManagedInstallReport.plist timestamps to ISO 8601 format, with timezone information. 
git-svn-id: http://munki.googlecode.com/svn/trunk@852 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-25 14:48:03 +00:00
Greg Neagle
1e4c4c74dc Clean up some vestiges of the support for aliases. 
If there's a download error, make sure what gets sent to munkicommon.display_error is a string; otherwise we get an unhandled exception when writing out our report.

Add "localmanifestpath" option to updatecheck.check(). This may be used if I implement the alternate Apple Software Update mechanism, and should also be useful for a future Puppet package provider or any programmatically-generated manifest.

git-svn-id: http://munki.googlecode.com/svn/trunk@847 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-24 04:13:20 +00:00
MagerValp
7e8931968d Added --version/-V to all interactive tools. 
git-svn-id: http://munki.googlecode.com/svn/trunk@846 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-23 08:37:37 +00:00
Greg Neagle
157f82b690 Removed abandoned Adobe options from usage check. 
git-svn-id: http://munki.googlecode.com/svn/trunk@842 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-21 22:50:31 +00:00
Greg Neagle
d7c52a9434 Fixed string substitution error 
git-svn-id: http://munki.googlecode.com/svn/trunk@835 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-21 13:27:12 +00:00
Greg Neagle
131d3873c9 Added some additional logging and info messages, all logoutinstall-type installs (including 'checkandinstallatstartup') now do not check for system idle, but just install. 
git-svn-id: http://munki.googlecode.com/svn/trunk@831 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-20 16:57:48 +00:00
Greg Neagle
64144bfe17 Log when we skip an Apple Software Update check 
git-svn-id: http://munki.googlecode.com/svn/trunk@830 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-20 16:49:41 +00:00
Greg Neagle
f9d1b2b3bd Fix unhandled exception in munkicommon.prefs() when the prefs file is missing by replacing orphaned "prefsfile" with "MANAGED_INSTALLS_PLIST_PATH" 
git-svn-id: http://munki.googlecode.com/svn/trunk@829 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-20 16:41:10 +00:00
Greg Neagle
4029836c08 Fix for empty pkginfo extension. 
git-svn-id: http://munki.googlecode.com/svn/trunk@823 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-19 23:09:34 +00:00
Greg Neagle
b52f45cdf0 More print statement cleanup. 
git-svn-id: http://munki.googlecode.com/svn/trunk@821 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-19 17:22:55 +00:00
Greg Neagle
b78ba8e03c More cleanup -- replacing print statements with calls to munkicommon.display_* methods. 
git-svn-id: http://munki.googlecode.com/svn/trunk@820 a4e17f2e-e282-11dd-95e1-755cbddbdd66
 2010-10-19 17:15:41 +00:00