Commit Graph

69 Commits

Author SHA1 Message Date
Greg Neagle
12d4f0d27e Update copyright info on files; remove abandoned tools from code/tools 2016-03-15 09:32:28 -07:00
Samuel Keeley
23d2e85545 Merge branch 'master' into samuel-docs 2015-11-20 14:54:19 -08:00
Samuel Keeley
b44ae33ca0 Update OS X text 2015-11-13 20:57:25 -08:00
Samuel Keeley
67513852fc Replace internal documentation URLs with HTTPS versions 2015-11-13 20:42:50 -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
Brian Warsing
ee1bcac831 follow symlinks when walking pkgs and pkgsinfo
To protect against infinite recursion, `os.walk` will not follow symlinks by
default. However, this safety feature can hamper the utility of makecatalogs if
admins want to symlink-in resources from multiple munki repos, so turn it off.
2015-05-01 11:13:18 -07:00
Nick McSpadden
72e6901cc2 Fixed indentation issue 2015-04-15 09:58:19 -07:00
Nick McSpadden
938f50ead9 TABS 2015-03-20 10:26:17 -07:00
Nick McSpadden
6877101604 Better future-proof check for uninstaller_item_location
AdobeCCPUninstaller _must_ have an uninstaller_item_location key. If
uninstaller_item_location is specified, it must be valid.
2015-03-20 10:24:57 -07:00
Nick McSpadden
01c0b5393d Supports AdobeUberUninstaller removal 2015-03-16 10:00:52 -07:00
Nick McSpadden
34769fb436 Revert "Now works with other "Adobe" uninstaller_types"
This reverts commit a77c42b2a9.
2015-03-13 15:04:18 -07:00
Nick McSpadden
a77c42b2a9 Now works with other "Adobe" uninstaller_types 2015-03-13 12:58:07 -07:00
Nick McSpadden
2c140e915a Added uninstaller_item_location check to makecatalogs 2015-03-13 12:12:32 -07:00
Samuel Keeley
4ed5e4e381 checking for name key in makecatalogs, fixes #450 2015-02-12 06:19:37 -08:00
Greg Neagle
4fcc78985a Code formatting fix for makecatalogs 2015-01-23 12:33:43 -08:00
Greg Neagle
9f7a0598dc Merge branch 'master' of https://github.com/munki/munki
Conflicts:
	code/client/makecatalogs
2015-01-23 11:34:56 -08:00
Greg Neagle
e4fb9cac47 PyLint cleanups for makecatalogs; also define errors array before use by iconhashing code 2015-01-23 11:26:19 -08:00
Samuel Keeley
a85a071745 pylint fixes 2015-01-23 11:25:25 -08:00
Samuel Keeley
be33651d43 remove one more line 2015-01-22 23:00:55 -08:00
Samuel Keeley
3f0af4438d simplification 🍐 2015-01-22 22:01:18 -08:00
Samuel Keeley
94cf5870bc more 80 chars and suggested simplification 2015-01-22 14:17:57 -08:00
Samuel Keeley
a7ceae35d4 remove redundancy and lines > 80 chars 2015-01-22 14:11:17 -08:00
Samuel Keeley
93659f0c63 add .png to icon_name check 2015-01-21 11:20:36 -08:00
Samuel Keeley
eda254fefa fix a bunch of problems with icon hashing 2015-01-21 09:24:46 -08:00
Samuel Keeley
3bb3b62b13 sha256 2015-01-21 07:46:50 -08:00
Samuel Keeley
d71a4e4708 don't break when no icons directory 2015-01-21 07:42:38 -08:00
Samuel Keeley
4e3bd4f0f2 iconspath 2015-01-20 22:01:18 -08:00
Samuel Keeley
c22537aa3d modify makecatalogs to automatically generate icon hashes and insert them into catalogs 2015-01-20 21:43:46 -08:00
Greg Neagle
fddd138000 Bumping version to 1.0.0. Updated copyright dates. 2014-01-10 08:20:15 -08:00
Greg Neagle
11aa83062f makepkginfo now inserts some user/environment metadata into generated pkginfo files. It stores the metadata under the '_metadata' key. makecatalogs now strips any key starting with _ from pkginfo before adding the pkginfo to a catalog. 2013-11-04 10:43:06 -08:00
Greg Neagle
c34745b82a Attempt to adjust makecatalogs to play nicer with PackageURL and PackageCompleteURL keys in pkginfo files 2013-07-22 09:37:18 -07:00
Greg Neagle
bb3ff68892 Unicode filename fixes for makecatalogs. 2013-04-04 12:08:26 -07:00
Greg Neagle
98de6685cc Merge of https://code.google.com/r/theheig-conditionals/ apple-update-metadata: Adds support for Munki-style metadata to Apple updates. 2013-02-19 17:09:40 -08:00
Greg Neagle
defd773d60 Some PyLint cleanups for makecatalogs 2013-02-12 20:19:41 -08:00
Greg Neagle
d0a8735c21 Merge branch 'development' of https://github.com/hjuutilainen/munki 2013-02-12 20:13:42 -08:00
Heig Gregorian
4b322e1e43 Use underscores instead of hyphens for new installer_type
apple-update-metadata changed to apple_update_metadata
2013-02-12 08:51:14 -08:00
Heig Gregorian
d92127c241 Initial commit for new installer_type 'apple-update-metadata'
Using the new '--apple-update' option available in makepkginfo (and
therefore munkiimport), an admin can generate metadata pkginfo files
for Apple updates.  Supported metadata keys will modify munki's
behavior of the specified Apple update offered to the client.  Examples
would include 'force_install_after_date' and 'RestartAction'.  The
'makecatalogs' utility has also been updated to allow for this new
installer_type when creating catalogs.

NOTE: Client-side implementation is not included in this commit.  This
commit only deals with the creation of these specialized pkginfo files.
2013-02-06 13:53:43 -08:00
Greg Neagle
4b71ace130 Updated copyright info on all files with copyright info. 2013-01-28 11:55:09 -08:00
Hannes Juutilainen
4d5ec2d617 Modified exit codes and output
makecatalogs should only exit with code 0 if new catalogs were written
to disk
2013-01-25 13:28:06 +02:00
Hannes Juutilainen
5d6a699c7f Added more comments 2013-01-25 13:26:00 +02:00
Hannes Juutilainen
7de3a20e9f Added force option
Added force option to disable sanity checks
2013-01-25 13:24:38 +02:00
Arjen van Bochoven
5daf8ce9d4 Fixed wrong condition in makecatalogs 2012-07-02 20:36:10 +02:00
Arjen van Bochoven
0b495c7a14 Changed package_less install flag to installer_type=nopkg 2012-07-02 11:57:38 +02:00
Arjen van Bochoven
01ddeb765d Added packageless_install 2012-06-30 22:52:22 +02:00
Greg Neagle
f4baa87667 Added comment as to why we delete notes from pkginfo before adding to catalog. 2012-05-22 16:11:37 -07:00
Heig Gregorian
ff7c8f990b Merge branch 'master' into makecatalogs 2012-05-22 14:49:11 -07:00
Greg Neagle
0ed65b7364 Better warning and safer behavior if a pkginfo's catalogs array contains an empty item (<string></string>) 2012-05-07 12:17:32 -07:00
Heig Gregorian
dcf0f91fe8 Remove 'notes' from pkginfo before writing to catalog
'notes' has been proposed as a reserved field for administrator notes.
This addresses a concern regarding exposing the notes in catalogs
generated by 'makecatalogs'.
2012-05-01 18:05:43 -07:00
Greg Neagle
7c910a1180 makecatalogs now skips all files that start with a period. Minor output tweak in munkiimport. 2012-02-28 20:58:07 -08:00
Greg Neagle
2d360448fa Fix undefined 'dirnames' error 2012-02-24 17:11:37 -08:00