Commit Graph

1370 Commits

Author SHA1 Message Date
Greg Neagle 37276f5307 Better determination when munkiimport item is an apple_update_metadata item; fixes bug where 'munkiimport --apple-item' worked but 'munkiimport --apple_item' failed, despite makepkginfo --help indicating both syntaxes should work. 2015-12-02 10:54:43 -08:00
Justin McWilliams cec30b1439 Ensure 60, 30, 10 & 5m reboot notices are seen.
Ensure that 60, 30, 10, and 5 minute notifications are *all* seen before forcefully rebooting a machine, not merely the 60 minute notification.

Previously, if the 60m notice was seen, then the machine was put to sleep for 55m+, it could reboot without another notice after waking up.
2015-11-18 14:13:53 -08:00
Samuel Keeley 67513852fc Replace internal documentation URLs with HTTPS versions 2015-11-13 20:42:50 -08:00
Samuel Keeley 5c12185da4 Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0 2015-11-13 20:35:24 -08:00
Greg Neagle 436d8c8b46 Bumping version to 2.4.0 for release candidate 2015-11-09 09:18:37 -08:00
Greg Neagle 7e94f2fc73 Merge pull request #534 from grahamgilbert/follow-redirects
Credit where credit's due
2015-10-29 09:24:57 -07:00
Graham Gilbert 0459a66f6d Credit where credit's due 2015-10-29 16:22:59 +00:00
Greg Neagle 9da705a1a2 Merge pull request #530 from grahamgilbert/follow-redirects
Preference to Follow HTTP Recirects
2015-10-28 10:41:52 -07:00
Justin McWilliams e9b013dbf7 Log warning when "Products" key is not found in filtered Apple Update catalog
Log warning when "Products" key is not found in filtered Apple Update catalog
2015-10-28 12:37:09 -04:00
Greg Neagle f7f4b70106 Merge pull request #520 from natewalck/master
Added LocalOnlyManifest feature
2015-10-26 14:12:14 -07:00
Greg Neagle 41de516720 PyLint cleanup 2015-10-23 10:10:26 -07:00
Greg Neagle cc794c9c39 Merge pull request #532 from munki/samuel-munkiimport
Don't offer to create icons for profiles or Apple metadata
2015-10-23 10:05:47 -07:00
Graham Gilbert 15d34fa5a5 Spelling is hard 2015-10-23 17:04:05 +00:00
Samuel Keeley e0f771ceda Don't offer to create icons for profiles or Apple metadata 2015-10-23 10:02:47 -07:00
Shea Craig ae9cd75dc9 Add mobileconfig to the usage of munkiimport. 2015-10-23 11:32:31 -04:00
Graham Gilbert effe971249 Preference to Follow HTTP Recirects 2015-10-23 10:33:20 +01:00
Greg Neagle f3904760cd In El Capitan, avoid changing the softwareupdate CatalogURL unless it's set in Munki's preferences. 2015-10-22 09:01:39 -07:00
Greg Neagle 422504e639 Merge branch 'master' of https://github.com/munki/munki 2015-10-14 14:14:29 -07:00
Greg Neagle 69c6398c6e Filter out _mbsetupuser when checking for GUI users at install time. Fix is similar to https://github.com/munki/munki/commit/0f8a51f9e72cbc383e015d21f4ef44f4b0059023, which was for Managed Software Center.app 2015-10-14 14:14:17 -07:00
Nate Walck b7a361d285 Added LocalOnlyManifest 2015-10-14 11:39:11 -07:00
Justin McWilliams 52009ae9df Edit Fix string concatenation of "No %s in item info" MunkiDownloadError 2015-10-12 12:06:19 -04:00
Justin McWilliams 2e34939a9a Fix string concatenation of MunkiDownloadError("Insufficient disk space to download and install %s") 2015-10-09 17:09:23 -04:00
Greg Neagle 087bed6b72 PyLint cleanups for managedsoftwareupdate 2015-10-09 08:59:26 -07:00
Greg Neagle 3fd17e5587 Rephrase logging about skipping Apple updates when Munki items to install contain Apple items; move code block to clearer place 2015-10-09 07:12:10 -07:00
Pepijn Bruienne f3e86d2087 Add logging about skipped ASU checks when installing Apple items. 2015-10-09 09:40:09 -04:00
Greg Neagle b2913d6d7c Bump main version number to 2.3.1 in prep for new release 2015-09-15 13:52:33 -07:00
eholtam a663844ccf Update manifestutil find() output verbiage
Changed "items" to "matches" to better reflect what 'find' finds.
2015-09-01 11:01:31 -05:00
eholtam 5e9978f711 Remove find() breaks
Removing the breaks in the find function to allow multiple matches per section per manifest.
Addresses issue https://github.com/munki/munki/issues/512
2015-09-01 10:24:14 -05:00
Greg Neagle c2239c5de8 Merge pull request #507 from erikng/master
preupgrade_alert support
2015-08-19 09:58:48 -07:00
Greg Neagle 891d70c778 Fix help message for managedsoftwareupdate --id 2015-08-19 09:46:04 -07:00
Erik Gomez 0bcf01693e preupgrade_alert support 2015-08-17 09:33:00 -05:00
Greg Neagle 853fcfdb23 PyLint cleanups on munkiimport 2015-08-12 14:21:14 -07:00
Greg Neagle 416edbc2dc Fix issue when matching receipts when an individual receipts's version number is different from the overall item version number 2015-08-12 13:00:24 -07:00
Greg Neagle fb5d985ba1 Bumping version for 2.3 RC1 2015-08-06 08:39:56 -07:00
Greg Neagle f39e6b5cd7 Kill stray comma 2015-07-29 15:04:32 -07:00
Greg Neagle 6471f6d2a3 If there is no orignal softwareupdate CatalogURL on 10.11, use --clear-catalog to reset. 2015-07-29 13:42:18 -07:00
Greg Neagle 0ce7846fe5 Make appleupdates_test.py stop complaining 2015-07-29 08:57:12 -07:00
Greg Neagle 9e0deb7540 Some changes to appleupdates.py to work around issues on 10.11 2015-07-29 08:11:03 -07:00
Greg Neagle 1dd8329d66 Inject NSAppTransportSecurity key and value into [NSBundle mainBundle]'s infoDictionary in order to make App Transport Security happy on 10.11 2015-07-29 08:09:39 -07:00
Greg Neagle 441e649288 take out another instance of 'launchctl bsexec' usage under 10.11 2015-07-14 13:44:15 -07:00
Greg Neagle 6f3b65feac Don't use under 10.11 since SIP prevents it from doing what we want 2015-07-14 13:39:49 -07:00
Greg Neagle fd75be09fa Remove mistaken addition of OnDemand flag to configuration pkginfo in makepkginfo 2015-07-03 15:39:06 -07:00
Greg Neagle 3512f5389b Another attempt to actually accomplish what was intended here: https://github.com/munki/munki/commit/1e511689d562f633b93b7f59cc2e2b349eb987e0 -- turns out ClearAppleUpdateInfo() method wasn't actually being called by anything. Sigh. 2015-06-30 18:39:28 -07:00
Greg Neagle 900b34c481 Merge pull request #490 from Multimac/local_manifest_name
Update getmanifest to create unique filename for local copy of manifest
2015-06-29 08:28:31 -07:00
David Symons 3e4935ec9b Changed filename checking in cleanUpManifests to ignore all files named 'SelfServeManifest' 2015-06-25 14:38:04 +10:00
David Symons cb5117b18d Reworked cleanUpManifests to use os.walk instead of recursion, cleaning it up.
Added better exception handling to manifest folder creation in getmanifest
2015-06-25 14:30:13 +10:00
David Symons 495873e7a1 Added exception for SelfServeManifest to cleanUpManifests 2015-06-23 16:58:15 +10:00
David Symons d041d90b6f Fixing spelling mistake 2015-06-23 16:46:58 +10:00
David Symons b1840af0ac Added cleanUpManifests to check over all manifests and remove those which are no longer used 2015-06-23 16:43:24 +10:00
David Symons d7512980f5 Flattened MANIFESTS, removing unnecessary sub-dictionaries. Also updated variable names to be less confusing 2015-06-23 16:02:22 +10:00