Commit Graph

2125 Commits

Author SHA1 Message Date
eholtam 36514fc748 Fixed manifestutil traceback if no subcommands are given
In manifestutil if no subcommands are given manifestutil exits with a
trackback.  I added a check to see if the number of subcommands is < 1
and to list the available subcommands if so.
2016-01-07 10:44:35 -06:00
eholtam 8c7a10226f Merge remote-tracking branch 'munki/master' 2016-01-07 10:35:43 -06:00
Greg Neagle 976c842224 Change gurl.py connection timeout to 60 seconds 2015-12-22 14:57:41 -08:00
Greg Neagle b9a8ec51a7 Merge pull request #555 from maximermilov/master
additional logging of Managed Software Center GUI events
2015-12-10 14:53:28 -08:00
Maxim Ermilov 7affe037f9 more logging 2015-12-10 16:56:49 -05:00
Greg Neagle 4ad7237f23 Display error alert if MSC.app can't save user choices to the SelfServManifest. Addresses issue #519 2015-12-09 12:56:37 -08:00
Greg Neagle 437af40d2b PyLint cleanups 2015-12-09 11:53:14 -08:00
Greg Neagle c19f2d7936 Simplfy default user-agent header. 2015-12-09 11:41:30 -08:00
Greg Neagle fda740c046 Merge pull request #537 from mkuron/patch-1
Set User-Agent header in HTTP requests
2015-12-09 11:36:46 -08:00
Greg Neagle d30aa2ca44 Merge pull request #540 from munki/samuel-docs
Minor internal text updates
2015-12-09 11:30:39 -08:00
Greg Neagle e1b4f5fba2 Update README.md 2015-12-07 12:14:39 -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
Greg Neagle b03e560214 Merge pull request #549 from juofmgoblue/patch-6
setup MSC logging before making logging calls
2015-11-30 15:50:56 -08:00
Justin McWilliams c4b5206e6c setup MSC logging before making logging calls 2015-11-30 18:20:26 -05:00
Greg Neagle eeb465e7d3 Merge pull request #548 from juofmgoblue/patch-5
Fix tests broken in https://github.com/munki/munki/pull/533
2015-11-30 08:23:14 -08:00
Justin McWilliams 84e0608882 Fix tests broken in https://github.com/munki/munki/pull/533 2015-11-30 10:11:29 -05:00
Greg Neagle 758f7ebe19 Fix copyright and licensing info in main.m's comments 2015-11-24 14:04:51 -08:00
Greg Neagle a96d55ca49 Track items that were in SelfServeManifest's managed_installs -- when a removal is requested and then cancelled, item should be re-added to SelfServeManifest's managed_installs. Addresses issue #546. 2015-11-23 16:56:21 -08:00
Greg Neagle 8fc18792c8 Show preupgrade_alert if applicable when adding an item from the updates list view; show preuninstall_alert if applicable when removing an item from the My Items view. Addresses issue 545 and jessepeterson's comment on issue 507. 2015-11-23 13:50:19 -08:00
Samuel Keeley 7c5b6ba449 Make the markdown look better 2015-11-20 15:00:16 -08:00
Samuel Keeley 4aab73ea65 Merge branch 'samuel-docs' of github.com:munki/munki into samuel-docs 2015-11-20 14:55:23 -08:00
Samuel Keeley 23d2e85545 Merge branch 'master' into samuel-docs 2015-11-20 14:54:19 -08:00
Greg Neagle 6ad9066933 Update more Base SDK references in Xcode project files to "macosx"/"Latest OS X" 2015-11-19 09:17:00 -08:00
Michael Kuron 918ebc64e4 Fix wrong line break 2015-11-19 09:52:26 +01:00
Michael Kuron 6f0a10f1da Cache default user agent 2015-11-19 09:48:52 +01:00
Greg Neagle 942e645387 Remove unused JavaScript function from package distribution file. 2015-11-18 20:00:42 -08:00
Greg Neagle 466c1716df Better detection in pkg distribution if the launchd pkg needs to be installed. Thanks to Pepijn Bruienne for the assist. 2015-11-18 19:47:43 -08:00
Greg Neagle cbe21d36ff Change Base SDK for apps to 'Latest OS X' and OS X Deployment Target to 'OS X 10.6' 2015-11-18 16:36:06 -08:00
Greg Neagle 0c11978c84 Remove print statement added when debugging 2015-11-18 14:26:02 -08:00
Greg Neagle 0908595ab1 Better handling of character references when parsing description HTML 2015-11-18 14:24:08 -08:00
Greg Neagle 294339c3f4 Merge pull request #543 from juofmgoblue/patch-4
Ensure 60, 30, 10 & 5m reboot notices are seen.
2015-11-18 14:21:01 -08:00
Justin McWilliams cec30b1439 Ensure 60, 30, 10 & 5m reboot notices are seen.
Ensure that 60, 30, 10, and 5 minute notifications are *all* seen before forcefully rebooting a machine, not merely the 60 minute notification.

Previously, if the 60m notice was seen, then the machine was put to sleep for 55m+, it could reboot without another notice after waking up.
2015-11-18 14:13:53 -08:00
Michael Kuron 0bc12e57bf Python and CFNetwork version in User-Agent 2015-11-18 10:29:59 +01:00
Samuel Keeley 0ddbb72350 Markdown formatting 2015-11-17 16:01:18 -08:00
Samuel Keeley 40851f8310 Pendantic pendantary
Back to the Mac (OS X 10.6.6)
2015-11-17 15:53:35 -08:00
Greg Neagle ce43b4318d Merge pull request #538 from munki/samuel-readme
Update README.md
2015-11-17 13:50:01 -08:00
Greg Neagle 5a7197c690 Merge pull request #539 from munki/samuel-https
Update many http links to https links
2015-11-17 13:49:17 -08:00
Samuel Keeley ac39dda439 Move Preferences readme so github picks it up 2015-11-13 20:58:48 -08:00
Samuel Keeley b44ae33ca0 Update OS X text 2015-11-13 20:57:25 -08:00
Samuel Keeley f1419e2ffe Update git download link 2015-11-13 20:57:06 -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
Samuel Keeley d2bd12db33 Update README.md
Move the announcement to the bottom of the readme
2015-11-13 20:31:19 -08:00
Michael Kuron 088302be1d User-Agent header if other headers are specified 2015-11-13 15:35:29 +01:00
Michael Kuron d1f9475c54 header_dict_from_list documentation 2015-11-13 15:07:53 +01:00
Michael Kuron 4d36b6afb1 Set User-Agent header in HTTP requests
Previously Munki only set a User-Agent header on requests made from the appleupdates.py code. Everything else (catalog, manifest, package downloading) reported something like `"Python/2.7.5 CFNetwork/673.6 Darwin/13.4.0 (x86_64) (VMware7%2C1)"` to the server.
2015-11-13 14:54:54 +01:00
Greg Neagle 436d8c8b46 Bumping version to 2.4.0 for release candidate v2.4.0 2015-11-09 09:18:37 -08:00
Greg Neagle 7e94f2fc73 Merge pull request #534 from grahamgilbert/follow-redirects
Credit where credit's due
2015-10-29 09:24:57 -07:00
Graham Gilbert 0459a66f6d Credit where credit's due 2015-10-29 16:22:59 +00:00
Greg Neagle 9da705a1a2 Merge pull request #530 from grahamgilbert/follow-redirects
Preference to Follow HTTP Recirects
2015-10-28 10:41:52 -07:00