Commit Graph

170 Commits

Author SHA1 Message Date
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
Greg Neagle
ba387f2b7c Convert all command-line arguments to Unicode (assuming utf-8 encoding) to eliminate issues with item paths containing Unicode characters 2015-03-13 12:20:20 -07:00
Greg Neagle
b145d6f0ce Display an error message when attempting to import a profile that does not nave a PayloadType of 'Configuration' 2015-02-19 17:00:59 -08:00
Greg Neagle
7f9f99f6e5 When creating pkginfo for a configuration profile, set minimum_munki_version to 2.2 2015-01-20 08:24:06 -08:00
Greg Neagle
a4a0d9d544 Merge config-profile-support into master 2015-01-13 06:55:24 -08:00
Greg Neagle
58d8a07dec Clean up the tmpdir on exit of iconimporter, makepkginfo and munkiimport 2015-01-09 15:08:52 -08:00
Greg Neagle
cb81e4616a Support for signed profiles. 2014-12-17 11:54:06 -08:00
Greg Neagle
64ae22c36d makepkginfo can now handle profiles that are missing the PayloadDescription field. 2014-12-17 10:16:08 -08:00
Greg Neagle
b61a858f66 Add uninstallable=True to generated pkginfo; check that a profile is a "Configuration" profile (not "configuration") 2014-12-17 06:09:02 -08:00
Greg Neagle
83fabfb5ce Add support for importing, installing and removing configuration profiles. 2014-12-16 21:57:41 -08:00
Greg Neagle
63a3b69775 Always return a plist when --verify-options-only is given. Fixes issues with --apple-update and --nopkg when given to munkiimport. 2014-11-24 18:51:10 -08:00
Greg Neagle
a6955fd0d4 Initial explict support for Adobe CCP packages. Use to import a CCP installer and uninstaller. 2014-11-03 14:01:20 -08:00
Greg Neagle
423ec8b790 PyLint cleanup: replace all unused_foo variables with dummy_foo variables to make PyLint happy 2014-10-26 11:42:33 -07:00
Greg Neagle
d94b8cfdf1 makepkginfo: if -i/--item is specified, don't try to guess if a dmg contains an Adobe installer 2014-09-02 22:38:31 -07:00