Commit Graph

183 Commits

Author SHA1 Message Date
Greg Neagle 36769cdbbc Revert "Change all shebangs in prep for Python 3.12 (where symlinks to the Python executable are broken)"
This reverts commit fdec07b615.
2024-02-23 10:49:00 -08:00
Greg Neagle fdec07b615 Change all shebangs in prep for Python 3.12 (where symlinks to the Python executable are broken) 2024-02-23 09:05:16 -08:00
Greg Neagle 2b327569b4 Update copyright dates 2024-01-30 16:14:29 -08:00
Greg Neagle 767f64b12a Update copyright info 2023-02-22 09:59:22 -08:00
Greg Neagle 5ee0f5928a Update copyright dates 2022-05-10 16:09:38 -07: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 9d3e265cb8 Update copyright dates 2021-02-20 09:05:58 -08:00
Greg Neagle e1b5d505bc Revert "Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)""
IOW, restore the rename of "/usr/local/munki/python" symlink to "munki-python" (#997)

This reverts commit b9f9fffccc.
2020-09-15 16:46:34 -07:00
Greg Neagle b9f9fffccc Revert "munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)"
This change is still a good future goal, but is causing problems that are too difficult to work around right now and is delaying the vital release of Munki 5.1 for Big Sur compatibility.

This reverts commit 3bb91cabca.
2020-09-15 09:04:47 -07:00
David Aguilar 3bb91cabca munki: rename "/usr/local/munki/python" symlink to "munki-python" (#997)
Avoid masking the system /usr/bin/python by calling our symlink
"munki-python" instead of "python".

Closes #996
2020-07-07 13:58:34 -07:00
Greg Neagle 72a0535d0d Update Copyright dates 2020-01-01 08:53:37 -08:00
Greg Neagle af51af5cdd Change all sh-bang lines to #!/usr/local/munki/python 2019-07-16 22:14:47 -07:00
Greg Neagle 57f791b922 Python 3 compatibility changes for makepkginfo 2019-06-22 22:38:52 -07:00
Greg Neagle f1df5d96a6 Pylint fixes 2019-05-05 12:48:15 -07:00
Greg Neagle df60207145 Add 'from __future__ import absolute_import' to all files to enforce Python3-style imports 2019-05-03 21:34:56 -07:00
Greg Neagle 531d99a01a Convert all print statements to Python3-compatible print functions 2019-05-03 19:47:37 -07:00
Elliot Jordan 2ad27ff411 Align except clauses with PEP 3110 (#933)
This should work for Python 2.6+, including 3.
https://www.python.org/dev/peps/pep-3110/#compatibility-issues
2019-05-03 15:05:13 -07:00
Greg Neagle 918d0b7391 Update copyright dates 2019-01-02 10:31:50 -08:00
Greg Neagle 1428c40d06 Update copyright notices to include 2018 2018-01-20 08:46:22 -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 dbf0c95b9d Move munkiimportlib.py and pkginfolib.py into munkilib/admin 2017-11-19 08:39:22 -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 05ff4fa799 Warn user if creating pkginfo or importing a 'stub' Install macOS.app 2017-09-05 16:41:42 -07:00
Greg Neagle a64b1d7ab3 Add 'startosinstall' support to iconimporter, makepkginfo, and munkiimport 2017-04-01 12:33:35 -07:00
Greg Neagle 31c9b661b8 remove uneeded osutils.cleanUpTmpDir() calls 2017-03-11 18:58:35 -08:00
Greg Neagle 1b874c3e06 makepkginfo: Remove import of munkicommon; add imports of refactored modules 2017-03-02 10:00:01 -08:00
Greg Neagle 4053a0dbe7 Update copyright dates to 2017 2017-01-17 20:14:31 -08:00
Greg Neagle 8deb944a7c decrease repeated defintions of the same function 2017-01-09 10:14:16 -08:00
Greg Neagle 70aa3bd006 Restructure adobeutils 2017-01-06 14:45:13 -08:00
Greg Neagle 75e0722e8f makepkginfo now can parse an app's Info.plist's LSMinimumSystemVersionByArchitecture (if it exists) for minimum_os_version information 2016-05-24 14:35:07 -07:00
Greg Neagle 12d4f0d27e Update copyright info on files; remove abandoned tools from code/tools 2016-03-15 09:32:28 -07:00
Nick McSpadden 4cbafebbbf Fixed typo 2016-02-25 17:00:03 -08:00
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
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 fd75be09fa Remove mistaken addition of OnDemand flag to configuration pkginfo in makepkginfo 2015-07-03 15:39:06 -07:00
klou 069c8be699 add arguments check to criteria test
Checks for a single argument (installer item) as well as has_valid_install_critieria.  Multiple arguments fail via other checks, zero arguments (script_options) pass for pkginfo generation.
2015-06-10 13:08:24 -07:00
Brian Warsing 23423504fe fix issue #476
makepkginfo was crashing when trying to access non-existent keys in the catinfo
object. Replace `[]` accessor method with `get`.
2015-05-05 15:40:44 -07:00
Greg Neagle 85892be850 Merge branch 'one-time-tasks' 2015-04-15 08:54:50 -07:00
Erik Gomez 511d7f596c remove --ondemant_script
:(
2015-03-26 20:41:37 -05:00
Greg Neagle 7dbbf8f368 Add installer_type == 'apple_update_metadata' to has_valid_install_critieria function so makepkginfo doesn't warn when making pkginfo for apple_update items. 2015-03-25 11:36:51 -07:00
Erik Gomez 5253c5ec9d Add options for --ondemand_script and --OnDemand
Example:

makepkginfo --name RepairPermissions --displayname "Repair Permissions" --description "This tool will repair your disk permissions. This is helpful if you are experiencing issues with your machine." --nopkg --pkgvers=1.0 --unattended_install --ondemand_script="RepairPermissions.sh" --OnDemand
2015-03-23 18:56:18 -05:00
Greg Neagle 42a70f284c Tweak makepkginfo's warning message when there is no installation check info 2015-03-14 13:00:49 -07:00
Brian Warsing 79b319fa3e revise warning message and adjust formatting
Revise warning msg to remove ref to missing PayloadIdentifier and clean-up the
multiline string formatting to make it easier to read.
2015-03-14 11:36:56 -07:00
Brian Warsing 45ec79557a update warning to include PayloadIdentifier msg
In the unlikely event a profile with a missing PayloadIdentifier is
successfully parsed, produce a warning.
2015-03-14 09:54:47 -07:00
Brian Warsing eba3458790 add PayloadIdentifier as install criteria
PayloadIdentifiers are used to determine install status. Add this to the list
of acceptable install criteria.

In addition, DRY out the code and supply an explicit return value.
2015-03-14 09:47:10 -07:00
Brian Warsing 2557fd48bd produce a warning when install criteria is missing
Adds a check that produces a warning to stderr when the package being parsed
does not contain:
- a populated installs array
- a populated receipts array
- a populated installcheck_script
2015-03-14 08:24:38 -07:00
Brian Warsing 8a018bbc0d insert new func has_valid_install_critieria
Inspects compiled catalog info dictionary for valid install criteria.
Returns boolean.
2015-03-14 08:05:32 -07:00
Brian Warsing ac663350b0 kill hanging whitespace
Rather than including this in an effective commit, kill this hanging whitespace
in a separate commit on the off-chance it needs to be reverted.
2015-03-14 08:03:29 -07:00