Commit Graph

1935 Commits

Author SHA1 Message Date
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
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
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 0f8a51f9e7, 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
0f8a51f9e7 Ignore _mbsetupuser when checking for other GUI users prior to logout/restart 2015-08-20 10:42:54 -07:00
Greg Neagle
8378d43fbf Add missing installSessionErrorAlert method to AlertController 2015-08-20 10:22:33 -07:00
Greg Neagle
05dae35e23 Revert "Merge pull request #502 from munki/msulink"
This reverts commit 6bb4936be8, reversing
changes made to c2239c5de8.
2015-08-19 12:03:07 -07:00
Greg Neagle
6bb4936be8 Merge pull request #502 from munki/msulink
only create Managed Software Update.app symlink if it previously existed
2015-08-19 09:59:27 -07: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
Samuel Keeley
d02eb2a9c3 Don't make Utilities folder 2015-08-06 10:10:54 -07:00
Greg Neagle
364206acdf Removing notifier from master branch 2015-08-06 09:17:45 -07:00
Greg Neagle
fb5d985ba1 Bumping version for 2.3 RC1 2015-08-06 08:39:56 -07:00
Samuel Keeley
0b06bca521 spaces not tabs 2015-07-31 06:36:22 -07:00
Samuel Keeley
917159f1ab only create Managed Software Update.app symlink if it previously existed. 2015-07-31 06:32:40 -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
d0f0862436 Merge branch 'master' of https://github.com/munki/munki 2015-07-29 08:10:14 -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
498fee6fbb Merge pull request #499 from taniguti/Japanese-localization
Check and correct Japanese strings
2015-07-25 08:35:49 -07:00
Takanori TANIGUCHI
1cf8414c48 Check and fix Japanese strings 2015-07-25 17:51:48 +09:00
Takanori TANIGUCHI
ec4e98aae2 Correct year. 2015-07-25 17:44:32 +09: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
45b3fbf785 Update project settings for Managed Software Center and MunkiStatus to add Japanese localization 2015-07-08 15:25:36 -04:00
Allister Banks
d4233edf31 add localization for japanese, haven't modified project settings
munkiStatus and MSC Japanese localizations. MSC’s is tested thoroughly.
Not including additional line in build script that calls localize,
leaving that to @gregneagle
2015-07-08 14:15:21 -04:00
Greg Neagle
c92a0ba042 Protect against empty strings being passed as button labels for preinstall/preuninstall_alerts 2015-07-04 12:53:17 -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: 1e511689d5 -- turns out ClearAppleUpdateInfo() method wasn't actually being called by anything. Sigh. 2015-06-30 18:39:28 -07:00
Greg Neagle
60ce0fa167 Merge pull request #492 from erikng/master
Move paths.d to core package
2015-06-29 10:56:23 -07:00
Erik Gomez
45a36987f1 Revert to original recursive path. 2015-06-29 12:46:33 -05:00
Erik Gomez
8124b04f07 Add paths.d back to Admin pkg for sanity 2015-06-29 10:30:33 -05:00