Commit Graph

1924 Commits

Author SHA1 Message Date
Greg Neagle b5bc93bf8d Make MSC responsible for triggering a restart if needed and GUI user is present to avoid process synchronization issues 2015-02-25 15:35:42 -08:00
Greg Neagle c43a1e666d Don't add receipt info for payload-free flat pkgs to pkginfo since they do not leave receipts in the pkgutil receipts database. 2015-02-24 11:08:02 -08:00
Greg Neagle f42af65d17 makepkginfo: When getting receipt info from flat distribution pkgs, prefer the info from the subpackage's PackageInfo files to the top-level Distribution file 2015-02-23 19:12:02 -08:00
Greg Neagle ed9c0905b3 Merge branch 'master' of https://github.com/munki/munki 2015-02-19 17:01:15 -08: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
Samuel Keeley 4ed5e4e381 checking for name key in makecatalogs, fixes #450 2015-02-12 06:19:37 -08:00
Greg Neagle 1745cd295f Seperate the ideas of skipping the check phase and only installing so that managedsoftwareupdate doesn't auto-install cached items when the Munki server cannot be reached. 2015-02-06 09:35:15 -08:00
Greg Neagle 2a4bea0ce6 When creating temp space for 'profiles -C' output, provide a filename instead of a directory v2.2.0.2399 2015-01-27 08:48:15 -08:00
Greg Neagle d8c06093b0 Instead of reading (possibly signed) profile after install in order to get the PayloadIdentifier, just use the PayloadIdentifier from the pkginfo item. 2015-01-26 21:33:53 -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
Greg Neagle 5866452293 Merge pull request #444 from munki/makecatalogs-icons
modify makecatalogs to automatically generate icon hashes and insert them into catalogs
2015-01-23 11:09:37 -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
Greg Neagle 16726062d0 Remove '-f' from make_munki_mpkg_from_git.sh's usage message 2015-01-21 08:35:49 -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 c88ce43b65 Don't warn about no receipts or installs array for pkginfo for profiles 2015-01-20 21:34:46 -08:00
Greg Neagle 5530e26967 Update make_munki_mpkg_from_git.sh script to not complain if PackageMaker (!) isn't installed. 2015-01-20 08:34:44 -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 54c495d89c Merge pull request #442 from bochoven/add_icon_hash
Added support for icon_hash to munkiimport
2015-01-19 17:50:50 -08:00
Arjen van Bochoven c3577c210a Added support for icon_hash to munkiimport 2015-01-19 22:49:57 +01:00
Greg Neagle e660411348 When installing a profile, properly get and record the result of the install 2015-01-16 12:04:39 -08:00
Greg Neagle 847ce2d333 Merge pull request #425 from eigerman/master
Update updatecheck.py
2015-01-16 09:57:40 -08:00
eigerman d0fb81c99e Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/client/munkilib/updatecheck.py
2015-01-16 12:37:36 -05:00
Edward Eigerman d1cb27211a Update updatecheck.py 2015-01-16 09:14:56 -05:00
Edward Eigerman 3d7e743be6 Update updatecheck.py 2015-01-15 17:21:56 -05:00
Edward Eigerman 8800c7cf39 Update updatecheck.py 2015-01-15 17:20:14 -05:00
Greg Neagle 9c9ac8dcdd On items_to_copy, if destination_path is not specified, extract path from destination_item if it exists 2015-01-15 07:00:48 -08:00
Edward Eigerman d4875c9f1d Update updatecheck.py 2015-01-14 12:29:30 -05:00
Edward Eigerman 5a28ceb5bf Update updatecheck.py 2015-01-14 12:23:54 -05:00
Edward Eigerman 06b9247ce0 Update updatecheck.py 2015-01-14 12:23:26 -05:00
Greg Neagle a4a0d9d544 Merge config-profile-support into master 2015-01-13 06:55:24 -08:00
Greg Neagle 0c68a317b7 Catch more exceptions when processing conditional_items 2015-01-12 08:23:40 -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 a621238272 Bumping version to 2.1.1 v2.1.1.2352 2015-01-09 06:27:37 -08:00
Greg Neagle fc8ab4a438 Since there are now more possible triggers that require building a new munki.keychain, always build a new munki.keychain if a client cert exists. 2015-01-08 14:09:10 -08:00
Greg Neagle aeee99ee84 Add identity preferences for all URLs defined in Munki's preferences, not just SoftwareRepoURL 2015-01-08 11:17:52 -08:00
Greg Neagle ea264b9e12 Switch to a more 'correct' method of reading a signed configuration profile, using the 'security cms' tool. 2014-12-29 08:33:38 -08:00
Greg Neagle 1d4c8497bc Document yet another way to read signed profiles 2014-12-18 08:48:23 -08:00
Greg Neagle acc674860a Validate profile receipts before attempting to use them 2014-12-17 19:01:34 -08:00
Greg Neagle 0e08697252 Also track ProfileInstallDate in our profiles receipt database 2014-12-17 18:43:05 -08:00