Commit Graph

1961 Commits

Author SHA1 Message Date
Greg Neagle 4fd032567a Fix bad merge of version.plist 2018-03-27 17:14:01 -07:00
Greg Neagle 51efa81942 Merge branch 'master' into Munki3dev 2018-03-27 17:11:31 -07:00
Greg Neagle e1f5f0204b Explicitly clear softwareupdate's LastSessionSuccessful value before checking for updates to minimize false reports of unsuccessful sessions. 2018-03-27 17:08:02 -07:00
Greg Neagle 332212bfce When using os.uname()[1] to get the hostname, decode('UTF-8') to convert to Unicode 2018-03-23 16:00:53 -07:00
Greg Neagle b365ffcc0a update munkilib/version.plist for eventual release 2018-03-09 16:42:50 -08:00
Greg Neagle 9f200aa586 Bump version for eventual release 2018-03-09 16:41:07 -08:00
Greg Neagle 3e0120a0db managedsoftwareupdate --show-config also prints com.apple.SoftwareUpdate CatalogURL config if Munki is configured to install Apple updates. 2018-03-09 16:28:34 -08:00
Tom 7f6f0f865d Implemented optional_installs for localonly manifest (#837)
* Implemented optional_installs for localonly manifest

You can now add an optional_installs key to your localonly manifest,
which was not possible before.
2018-03-07 09:28:33 -08:00
Greg Neagle 82c076aa46 Add os_build_number and os_build_last_component to predicate info object (AKA built-in 'conditions') 2018-02-11 09:12:57 -08:00
Greg Neagle 4f8b47746d Fix for #829. munkiimport: Don't crash with IndexError when --apple-update option is used. 2018-01-24 14:54:04 -08:00
Greg Neagle 1428c40d06 Update copyright notices to include 2018 2018-01-20 08:46:22 -08:00
Greg Neagle f4078f6019 Set installed_size for High Sierra installer to 14.3GB when importing 2018-01-18 10:28:29 -08:00
Greg Neagle de06aa73c0 When processing included_manifests skip any empty items in the array. Prevents an unexpected error leading to a crash wirh some webserver confiugurations 2018-01-10 09:21:10 -08:00
Greg Neagle 15e677d5e4 Update some Gurl object method defintions for better compatibility with newer versions of PyObjC 2017-12-16 09:21:51 -08:00
Greg Neagle 0de5de02e8 Strip leading slashes from relative manifest pathname to prevent managedsoftwareupdate from storing local manifest copies in unexpected paths 2017-12-08 10:32:57 -08:00
Greg Neagle b676a5d894 app_usage_monitor: fix a commet typo - thanks @dre 2017-12-02 09:10:39 -08:00
Greg Neagle 97ab9ad234 Fix for Unexpected error in appleupdates when apple update metadata item contains 'RestartAction': 'None' for an item whose RestartAction is already 'None'. 2017-11-30 13:32:06 -08:00
Greg Neagle 0dc1f02511 munkilib/updatecheck/compare.py: Catch KeyError when attempting to find applications in installs arrays when an application item might not have a path key/value 2017-11-28 09:44:20 -08:00
Greg Neagle f7f7f527b4 makecatalogslib.py: _append_ extra errors to the end of the errors list; _extend_ does the wrong thing :-) 2017-11-27 11:05:03 -08:00
Greg Neagle ce5ddf2193 munkiimport: Fix issue where pkgs/ was prepended to the relative pkg path in the pkginfo. 2017-11-27 07:01:52 -08:00
Greg Neagle 833cd18806 Make some functions in munkiimportlib.py less chatty to make them easier to use in other code 2017-11-26 17:32:15 -08:00
Greg Neagle 0fc13759ab makepkginfo: Remove no-longer used --verify-options-only flag and code 2017-11-26 17:30:33 -08:00
Greg Neagle dd6e936e80 munkiimport now calls code in munkilib/admin/makecatalogs.py to rebuild catalogs instead of subprocessing makecatalogs 2017-11-19 17:56:09 -08:00
Greg Neagle 255f5762f5 Move reusable code from makecatalogs into munkilib/admin/makecatalogslb.py 2017-11-19 17:30:22 -08:00
Greg Neagle dbf0c95b9d Move munkiimportlib.py and pkginfolib.py into munkilib/admin 2017-11-19 08:39:22 -08:00
Greg Neagle 810d5d833d Move lots of munkiimport functions into munkilib/munkiimportlib.py so they can be called by other code 2017-11-19 07:04:44 -08:00
Greg Neagle b27aefe373 munkiimport now calls code in munkilib/pkginfolib to generate a pkginfo instead of subprocessing makepkginfo. 2017-11-18 15:09:16 -08:00
Greg Neagle b56c95e791 Move generation of makepkginfo option groups to pkginfolib so munkiimport can add them as well 2017-11-18 13:40:19 -08:00
Greg Neagle fe659e0180 More tweaks to pkginfolib and makepkginfo 2017-11-18 13:18:17 -08:00
Greg Neagle f0e6e3d1a9 Move some makepkginfo code into a lib module that can be called by other code (like, say munkiimport...) 2017-11-18 12:35:35 -08:00
Greg Neagle 11bc22b382 Merge branch 'issue814fix' into Munki3dev 2017-11-03 14:26:07 -07:00
Greg Neagle 8e1f2a92b0 More fixes for the missing NetFS.kNAUIOptionKey, NetFS.kNAUIOptionNoUI, and NetFS.kNetFSAllowSubMountsKey constants in High Sierra. 2017-11-03 14:18:32 -07:00
Greg Neagle 4cfdddcd97 Possible fix for issue #814 2017-10-25 09:06:56 -07:00
Greg Neagle 2b0f9a47ef Re-write AppleUpdates.plist after installing unattended Apple Updates. Attempt at addressing #804. 2017-10-22 09:29:02 -07:00
Greg Neagle 96816ba6cc PyLint clean up 2017-10-22 08:34:34 -07:00
Greg Neagle 3d7021af8f Use CoreGraphics and Image I/O to convert icns to png, preserving embedded ColorSync info under macOS < 10.13 2017-10-19 12:48:30 -07:00
Arjen van Bochoven 21927438ae Localized pkgsinfo support (#809)
* Add support for localized_strings in pkgsinfo files

* Update Munkiitems.py

Use NSBundle.preferredLocalizationsFromArray_forPreferences_ instead of
NSLocale.currentLocale

* Move localized_strings to GenericItem

And add localized_strings to iteminfo

* Add localized_strings to munkiimport
2017-10-13 09:03:05 -07:00
Greg Neagle b60bd34580 Bump version for development. 2017-10-09 11:52:53 -07:00
Greg Neagle 2462981994 Don't ignore the value of RestartAction for configuration profile installs. Fixes #808. 2017-10-09 11:50:00 -07:00
Greg Neagle e13c21e21e Prevent an issue on 10.13 when mounting a repo in the cli admin tools by hardcoding certain NetFS constants. 2017-09-18 10:27:37 -07:00
Greg Neagle eb17f853fb Don't set overall restartflag to False if a nopkg item doesn't require restart. Thanks to @chymb 2017-09-12 14:13:06 -07:00
Greg Neagle 2c5d2a0006 osinstaller: always initiate restart if startosinstall quits and has sent us SIGUSR1 2017-09-11 11:18:28 -07:00
Greg Neagle 54713665be Tweaks around restart handling after a successful startosinstall run 2017-09-11 09:44:38 -07:00
Greg Neagle c45b5e854b munkiimport: When attempting to get info on existing pkgs in the repo, only print a warning about failure to read catalogs/all if there are any items in pkgsinfo. Better first-import experience for new repos. 2017-09-08 11:00:46 -07:00
Greg Neagle 2aa7cee702 Merge branch 'Munki3dev' into fv_bootstrapping 2017-09-05 16:42:17 -07:00
Greg Neagle 05ff4fa799 Warn user if creating pkginfo or importing a 'stub' Install macOS.app 2017-09-05 16:41:42 -07:00
Greg Neagle 48957bb615 Merge branch 'Munki3dev' into fv_bootstrapping 2017-09-05 10:36:44 -07:00
Greg Neagle e1ccdae4fa Add the (presumed) default Apple softwareupdate CatalogURL to the list of OS-specific CatalogURLs in appleupdates/sync.py 2017-09-05 10:35:48 -07:00
Greg Neagle b64f62cc2f Merge branch 'Munki3dev' into fv_bootstrapping 2017-09-01 08:22:59 -07:00
Clayton Burlison 1c54ff3219 fix: Correct issue with Auth Restart (#800)
An invalid RecoveryKey can be set that causes FoundationPlist to throw
a ValueError. If this happens no restart happens. Instead we should log
the error and revert to a non-auth restart.
2017-09-01 08:20:49 -07:00