Commit Graph

3523 Commits

Author SHA1 Message Date
Greg Neagle
1abae70c40 Merge branch 'main' into universal2 2021-03-05 09:56:40 -08:00
Greg Neagle
7087bc22ef Quiet warnings about metadata for MSU_UPDATE_s 2021-03-05 09:55:55 -08:00
Greg Neagle
c6c5b1a958 Merge branch 'main' into universal2 2021-03-05 09:36:37 -08:00
Greg Neagle
8a0a2345da Yet another fix for --show-config for items that are forced False on Apple silicon 2021-03-05 09:34:32 -08:00
Greg Neagle
b2fedc79ab Merge branch 'main' into universal2 2021-03-04 09:36:05 -08:00
Elliot Jordan
1e3bb8a8a9 Minor spelling fixes (#1080)
* Fix "criteria" spelling in function name

* Fix "supervisory" spelling in docstring
2021-03-04 09:35:09 -08:00
Greg Neagle
36aba18b56 Merge branch 'main' into universal2 2021-03-03 22:16:38 -08:00
Greg Neagle
cae5863e95 Update an nb localized string for MunkiStatus to match the equivalent string in MSC.app 2021-03-03 22:15:34 -08:00
Greg Neagle
d55837e02f Merge branch 'main' into universal2 2021-03-03 22:10:52 -08:00
Marius Langseth
b39406be75 Update to Norwegian translation (#1069) 2021-03-03 22:09:04 -08:00
Greg Neagle
7f554f5bfb Bump Python version to 3.9.2 2021-03-02 08:28:22 -08:00
Klaus Wik
51a1ab0c92 Change false to False in prefs.py (#1074)
line 310 had value = false which of course fails ;)
2021-02-24 08:07:49 -08:00
Greg Neagle
d51592b5eb Merge branch 'Munki5dev' into universal2 2021-02-20 09:13:04 -08:00
Greg Neagle
82b720661a Update copyright dates 2021-02-20 09:12:34 -08:00
Greg Neagle
9a6610a74c Update copyright dates 2021-02-20 09:09:53 -08:00
Greg Neagle
9d3e265cb8 Update copyright dates 2021-02-20 09:05:58 -08:00
Greg Neagle
f2f1504a6f Don't crash for --show-config on Apple silicon 2021-02-16 15:16:30 -08:00
Greg Neagle
165e3e79a2 Merge branch 'main' into universal2 2021-02-12 13:37:18 -08:00
Greg Neagle
594c278241 Merge branch 'main' into Munki5dev 2021-02-12 13:36:51 -08:00
Greg Neagle
0620b2330c Fix typos in help text for make_munki_mpkg.sh and make_munki_mpkg_from_git.sh 2021-02-12 13:36:30 -08:00
Greg Neagle
bf0de64713 Merge branch 'Munki5dev' into universal2 2021-02-09 14:11:42 -08:00
Greg Neagle
998586a630 Force Apple softwareupdate prefs to false on Apple Silicon 2021-02-09 14:10:47 -08:00
Greg Neagle
49a1fc5bca Set deployment target of munki-notifier to 10.11; other tweaks 2021-02-09 14:08:56 -08:00
Greg Neagle
2dda6b7783 Don't ignore exceptions thrown in app_usage_monitor if given a bad request (one containing a None/nil value) 2021-02-08 17:21:31 -08:00
Greg Neagle
b1df42ab13 Don't ignore exceptions thrown in app_usage_monitor if given a bad request (one containing a None/nil value) 2021-02-08 17:21:15 -08:00
Greg Neagle
5650a22885 Don't ignore exceptions thrown in app_usage_monitor if given a bad request (one containing a None/nil value) 2021-02-08 17:20:39 -08:00
Greg Neagle
88a69af408 Bump version for upcoming release 2021-02-05 10:18:07 -08:00
Greg Neagle
613101480f Merge branch 'Munki5dev' into universal2 2021-02-05 09:12:49 -08:00
Greg Neagle
5f680b9862 Python 3 fixes for IOPlatform and sysctl functions ported from Python 2 :-( 2021-02-05 09:12:10 -08:00
Greg Neagle
a9756cef8e Merge branch 'Munki5dev' into universal2 2021-02-05 08:09:40 -08:00
Greg Neagle
0f6d817850 In info.py, get the hardware model without calling system_profiler 2021-02-05 08:09:20 -08:00
Greg Neagle
0de132711f Merge branch 'Munki5dev' into universal2 2021-02-04 16:58:28 -08:00
Greg Neagle
c8b9554d77 Get machine serial number without calling system_profiler. Works around manifest resolution issue when system_profiler times out or otherwise misbehaves. 2021-02-04 16:57:59 -08:00
Greg Neagle
2462b64e64 No longer include a no_python component package in the generated distribution package 2021-02-04 08:10:34 -08:00
Greg Neagle
d48a622e34 No longer include a no_python component package in the generated distribution package 2021-02-04 08:10:03 -08:00
Greg Neagle
e1cb5ae8fb app_usage_monitor: don't let app_version be undefined if app_path is falsish 2021-02-03 15:08:18 -08:00
Greg Neagle
9f733b6341 app_usage_monitor: don't let app_version be undefined if app_path is falsish 2021-02-03 15:07:49 -08:00
Greg Neagle
d26c8b5861 app_usage_monitor: don't let app_version be undefined if app_path is falsish 2021-02-03 15:06:55 -08:00
Greg Neagle
5096c0a209 Merge branch 'main' into universal2 2021-01-19 09:47:03 -08:00
Greg Neagle
f4fb3a30e3 Merge branch 'main' into Munki5dev 2021-01-19 09:46:42 -08:00
Greg Neagle
053e3eac9e Update pkg pre and postinstall scripts to use os version comparision compatible with Big Sur 2021-01-19 09:46:18 -08:00
Greg Neagle
778d01f5ab build_python_framework.sh: print any libraries found inside the generated Python framework that are not universal 2021-01-06 08:51:21 -08:00
Greg Neagle
1ba3fe3551 Merge branch 'main' into universal2 2020-12-15 08:16:02 -08:00
Greg Neagle
8b9de80131 Merge branch 'main' into Munki5dev 2020-12-15 08:15:26 -08:00
Greg Neagle
ae28a71550 Improved OS version comparisons taking into account new (Big Sur+) versioning 'style' 2020-12-15 08:15:03 -08:00
Greg Neagle
c9f74aed6d Merge branch 'main' into universal2 2020-12-14 14:34:18 -08:00
Greg Neagle
40779023ad Merge branch 'main' into Munki5dev 2020-12-14 14:33:51 -08:00
Greg Neagle
49625ed975 Fix for Software Update catalog issue with 11.1 2020-12-14 14:33:23 -08:00
Greg Neagle
a2fde07886 update build script and requirements for universal Python3 2020-12-11 16:31:31 -08:00
Greg Neagle
a433418c9d Merge branch 'main' into universal2 2020-12-09 10:36:20 -08:00