Commit Graph

1182 Commits

Author SHA1 Message Date
Greg Neagle c80b9a1041 PyLint cleanups; implement connection_willSendRequestForAuthenticationChallenge_ delegate method since it replaces two other method depreacted in 10.10 (connection_canAuthenticateAgainstProtectionSpace_, connection_didReceiveAuthenticationChallenge_) 2014-10-26 08:37:27 -07:00
Greg Neagle a3f137da33 PyLint formatting cleanup for munkilib.utils.py 2014-10-25 11:47:00 -07:00
Greg Neagle 95c542cb2a Bump version to 2.1.0 to reflect non-trivial NSURL changes 2014-10-25 10:10:35 -07:00
Greg Neagle e2e4a3967a Merge branch 'NSURL' 2014-10-25 10:08:48 -07:00
Greg Neagle 564e4ac368 Change munkicommon.tmpdir to a function so that importing munkicommon does not create orphaned munki-foo directories in /tmp 2014-10-25 10:06:37 -07:00
Greg Neagle f61bf432c8 Merge pull request #404 from jlrgraham/master
Sort catalog and manifest lists in manifestutil.
2014-10-24 11:12:08 -07:00
Greg Neagle 2b46ebebf5 Work around PyObjC issue on 10.6 by converting an NSData object to a string a different way 2014-10-24 09:32:36 -07:00
Greg Neagle bb6615ea32 Don't check for existence of client_cert_path if client_cert_path is None 2014-10-24 09:31:27 -07:00
Greg Neagle 653eb85d29 Merge branch 'master' into NSURL 2014-10-23 14:56:49 -07:00
Greg Batye 7bff4281dd Adding uninstall description pkginfo key 2014-10-23 14:48:52 -07:00
Greg Neagle 4e79aa60a5 Merge branch 'master' into NSURL 2014-10-23 14:22:49 -07:00
Justin L R Graham 6f8aa360d8 More explicit help string for items argument to iconimporter.
As per discussion in pull request #413.
2014-10-23 15:41:48 -05:00
Greg Neagle f670bcc1fd More debugging output from munkilib/keychain.py 2014-10-23 13:38:41 -07:00
Justin L R Graham 5878275821 Added options to restrict run to specified repo items. 2014-10-23 14:21:39 -05:00
Greg Neagle 43de90f8b0 Remove keychain operations from appleupdates.py. We'll need to revisit this if people use client cert authentication against their Apple Software Update server 2014-10-22 17:04:45 -07:00
Greg Neagle 69fd00beeb Rebuild the client keychain if the client cert or key is newer than the keychain 2014-10-22 14:33:38 -07:00
Greg Neagle 38ebbf79ec Move more code from makekeychain to munkilib.keychain; attempt to build keychain on demand; should not need to run makekeychain at all 2014-10-22 11:59:32 -07:00
Greg Neagle fa22d8aad7 Add CA certs as trusted to System keychain. When deriving the site_url from Munki's preferences, make sure it ends with a trailing slash 2014-10-21 14:55:28 -07:00
Greg Neagle ba00e77654 Merge branch 'master' into NSURL 2014-10-20 15:52:12 -07:00
Greg Neagle 22e816010b Bump version to 2.0.1 2014-10-17 08:17:05 -07:00
Greg Neagle 8c780d10b1 Add Yosemite SUS catalog to list of default catalogs. 2014-10-17 08:07:47 -07:00
Justin L R Graham da85ea032b Sort catalog and manifest lists in manifestutil. 2014-10-16 13:06:25 -05:00
Greg Neagle e232c1b955 New attempt to use NSURLConnection + keychain to replace curl 2014-10-15 16:39:38 -07:00
Pepijn Bruienne 42d2a211fb Change order of file discovery to match original order. 2014-10-15 11:20:22 -04:00
Pepijn Bruienne d300f043a3 Refactoring getFlatPackageInfo - Only extract the Distribution file or PackageInfo file(s) instead of the entire package. Works around an issue with bad xar compression with certain flat packages. 2014-10-15 10:31:36 -04:00
Pepijn Bruienne f967727d63 Refactor getFlatPackageInfo to better deal with bad xar compression. 2014-10-14 16:17:48 -04:00
Bart Reardon 0b0a8c09af Reverted to preinstall_alert and preuninstall_alert to keep in the scheme of other pkginfo keys 2014-10-07 22:01:34 +11:00
bartreardon a7189c4d6a added pre uninstall capability as well 2014-10-07 11:13:30 +11:00
Bart Reardon c77eed698c changed pkginfo item from 'alert' to 'preinstall_alert'
moved preinstall alert code to it's own function (takes preinstall_alert dict as argument)
compliant use of NSLocalizedString so genstrings can do its thing
2014-10-03 07:34:58 +10:00
Bart Reardon 0363e721d6 Better support for alert with dict for specifying alert values. 2014-10-02 21:05:39 +10:00
Bart Reardon 09928ecd8c Added optional user_agreement key. Displays text that end users can agree or not before continuing with install 2014-10-01 21:58:26 +10:00
Pepijn Bruienne c76fc99d6d Add entry to catch SwitchBoard.app in killStupidProcesses
The existing entry to kill off SwitchBoard.app being launched in the loginwindow context did not always work. Adding "/bin/bash /Library/Application Support/Adobe/SwitchBoard/SwitchBoard.app/Contents/MacOS/switchboard.sh" resolves this issue.
2014-09-26 12:55:47 -04:00
Greg Neagle b04bc925ea Fix for issue where ClientResourcesFilename preferences is ignored. 2014-09-25 07:09:59 -07:00
Greg Neagle 40e0f74fa5 makepkginfo: if -i/--item is specified, don't try to guess if a dmg contains an Adobe installer 2014-09-02 22:38:01 -07:00
Greg Neagle 60bc2dcd13 revert part of Revision: 90752e2f9768; proceed to install if options.logoutinstall or options.installonly are true, instead of doing options.auto actions first. The prior change caused SuppressLoginwindowInstall to prevent install during a bootstrapping session. 2014-08-21 16:00:20 -07:00
Greg Neagle 9f6bc782b4 If Munki is configured to check and install AppleSoftwareUpdatesOnly, update the LastCheckDate and LastCheckResult 2014-08-12 22:44:14 -07:00
Greg Neagle 3a23ad2607 Fix for unhandled exception when extracting an icon when munkiimport is called with the -p option 2014-08-01 13:22:18 -07:00
Greg Neagle a655a13e16 Fix for checking the extensions of icon names 2014-07-28 07:15:05 -07:00
Greg Neagle bb4fd416f8 manifestutil's interactive mode can now be cleanly exited via Control-D as suggested by Ryan Manly 2014-07-25 15:20:56 -07:00
Greg Neagle fd85f4ef5c Improved logic for adding .png to the end of possible icon names when downloading or displaying icons 2014-07-25 15:16:07 -07:00
Pepijn Bruienne ae5f9b4c75 Updated method by which icon_name is set for items with version names that includes periods (SomeApp5.5) 2014-07-25 14:40:19 -07:00
Greg Neagle 769e4a930f Remove trailing whitespace from all lines in adobeutils.py, iconutils.py, launchd.py, munkistatus.py, updatecheck.py (code style issue) 2014-07-22 10:32:02 -07:00
Greg Neagle 7d79748174 Remove trailing whitespace from all lines in managedsoftwareupdate (code style issue) 2014-07-22 10:27:21 -07:00
Greg Neagle 76fac17a40 Remove trailing whitespace from all lines in iconimporter (code style issue) 2014-07-22 10:26:29 -07:00
Greg Neagle 4eca232c69 Remove trailing whitespace from all lines in launchapp (code style issue) 2014-07-22 10:25:11 -07:00
Greg Neagle 324301fe6b Removing no longer used updatecheckhelper from repo 2014-07-22 10:21:09 -07:00
Greg Neagle b9c976f06f Remove trailing whitespace from all lines in supervisor (code style issue) 2014-07-22 10:19:40 -07:00
Greg Neagle 143b8af942 Remove trailing whitespace from all lines in munkiimport (code style issue) 2014-07-22 10:18:18 -07:00
Greg Neagle e183d94ad7 Remove trailing whitespace from all lines in manifestutil (code style issue) 2014-07-22 10:16:26 -07:00
Greg Neagle e118a18deb Update logouthelper to check for Managed Software Center instead of Managed Software Update 2014-07-22 10:04:02 -07:00