Commit Graph

1550 Commits

Author SHA1 Message Date
Greg Neagle
7013581371 Really fix the fileshare mounting code in manifestutil 2016-10-21 15:58:25 -07:00
eholtam
69af0bae02 Added subcommand refresh-cache 2016-10-21 17:49:18 -05:00
Greg Neagle
4c8ed8f161 Merge branch 'master' of https://github.com/munki/munki 2016-10-21 15:39:18 -07:00
Greg Neagle
e9bdb65ade Add new Sierra-compatible fileshare mounting code to manifestutil. 2016-10-21 15:38:58 -07:00
Greg Neagle
cccfec15b8 Merge pull request #665 from cwindus/master
manifestutil: expand-included-manifests
2016-10-21 15:15:16 -07:00
Greg Neagle
260418b7dd Merge pull request #667 from gmarnin/patch-2
makecatalogs, change the path separator
2016-10-18 14:56:54 -07:00
Greg Neagle
f3ee1d83e4 Some attempts to remove possible unicode issues 2016-10-17 10:49:43 -07:00
Greg Neagle
834796e967 Attempt #2 to catch KeyError exception when attempting to import NetFS's NetFSMountURLSync function. 2016-10-17 09:57:35 -07:00
Greg Neagle
8fa668edb6 Catch KeyError exception when attempting to import NetFS's NetFSMountURLSync function. 2016-10-14 14:27:04 -07:00
Greg Neagle
84271f6bb8 Bumping version.plist to 2.8.2 for upcoming bug-fix release 2016-10-12 16:34:06 -07:00
Greg Neagle
4aab802442 PyLint cleanups for munkiimport 2016-10-12 15:19:32 -07:00
Greg Neagle
78d58b58a5 Restore default text input in munkiimport under 10.6 2016-10-12 15:00:01 -07:00
Greg Neagle
0269b1a89c Fix for 'ImportError: cannot import name kCFNetworkProxiesHTTPSEnable' on older versions of OS X 2016-10-12 10:34:50 -07:00
Greg Neagle
778d66b08c Merge branch 'master' of https://github.com/munki/munki 2016-10-12 10:26:48 -07:00
Greg Neagle
23672ca187 Fix for ImportError: No module named NetFS error with munkiimport under OS X < 10.8 2016-10-12 10:26:34 -07:00
Samuel Keeley
52ad24583c Catch unicode error messages for downloads
On Yosemite the error message can have a `'` in it.

```
Downloading Command_Line_Tools_OS_X_10.10_for_Xcode_7.2-7.2.0.0.1.1447826929.dmg...
    0..20.WARNING: Download of Command Line Tools for Xcode failed: Error -1001: The operation couldn't be completed. (NSURLErrorDomain error -1001.)
ERROR: Unexpected error in updatecheck:
Traceback (most recent call last):
  File "/usr/local/munki/managedsoftwareupdate", line 1052, in <module>
    main()
  File "/usr/local/munki/managedsoftwareupdate", line 743, in main
    client_id=options.id.decode('UTF-8'))
  File "/usr/local/munki/munkilib/updatecheck.py", line 3027, in check
    installinfo)
  File "/usr/local/munki/munkilib/updatecheck.py", line 2172, in processManifestForKey
    item, cataloglist, installinfo)
  File "/usr/local/munki/munkilib/updatecheck.py", line 1993, in processInstall
    iteminfo['note'] = 'Download failed (%s)' % errmsg
UnicodeEncodeError: 'ascii' codec can't encode character u'\u2019' in position 33: ordinal not in range(128)
```
2016-10-05 11:02:47 +02:00
gmarnin
c68204d167 Fix for https://github.com/munki/munki/issues/666 2016-09-29 14:22:33 -04:00
Carl Windus
5d3521c3d7 Changed display-included-manifests to expand-included-manifests 2016-09-29 13:26:35 +10:00
Carl Windus
196eaaccf0 Added display_included_manifest() 2016-09-29 10:18:23 +10:00
Greg Neagle
b076916c0b Fix for mounting repos under /Volumes in Sierra. 2016-09-23 16:22:31 -07:00
Greg Neagle
9a3cff59f5 Remove strange extra characters that got inserted 2016-09-22 17:36:06 -07:00
Greg Neagle
e1983a19b4 Attempt to provide some progress feedback when installing/removing Adobe CC 2015.X products using the new HD format. 2016-09-22 17:17:46 -07:00
Samuel Keeley
fc2a70f121 catch the exception if /var/run/syslog is not listening 2016-09-14 14:26:24 -07:00
Greg Neagle
1a48bac756 Additional debug logging in appleupdates.py; more consistent way of getting product IDs in GetAvailableUpdateProductIDs 2016-09-06 12:15:37 -07:00
Greg Neagle
475c40287e Better detect and handle failed Apple update download sessions 2016-09-06 11:19:17 -07:00
Greg Neagle
61ab7b977e Merge pull request #651 from poundbangbash/master
Added 'rename-manifest' subcommand to manifestutil
2016-08-23 13:45:20 -07:00
Greg Neagle
64332c0964 Update repoclean help to note that --delete-items-in-no-manifests is not yet implemented. 2016-08-15 09:24:36 -07:00
Greg Neagle
5d605a4b0c Remove unused --dry-run option from repoclean 2016-08-15 09:05:31 -07:00
Greg Neagle
4f1321c1e9 Add repoclean tool to repo 2016-08-15 08:44:30 -07:00
eholtam
0fe3f8d0bf Added 'rename-manifest' subcommand to manifestutil 2016-08-12 22:14:22 -05:00
Greg Neagle
906400ded4 Merge pull request #641 from munki/adobe-hyperdrive
Add support for `makepkginfo` and new Adobe installers
2016-08-12 09:11:17 -07:00
Timothy Sutton
7a7fa3d47d lint fixes 2016-08-12 11:45:46 -04:00
Timothy Sutton
6481335929 Also retrieve BaseVersion and version from Application.json
- may be helpful to have more data available if needed later
2016-08-12 11:39:41 -04:00
Timothy Sutton
0e942ce45f Filter out non-HD installers when searching for prodVersion metadata 2016-08-12 11:39:02 -04:00
Timothy Sutton
aabc0ea205 Retrieve SAPCode key in optionXML.xml for both RIBS and HD
- so that we have this key regardless of RIBS and HD installers
- fixes #649
2016-08-12 09:56:23 -04:00
Greg Neagle
93baecaffb Merge branch 'master' of https://github.com/munki/munki 2016-08-11 21:33:00 -07:00
Greg Neagle
748767055a Bump version for next round of development and testing 2016-08-11 07:17:46 -07:00
verycarefully
293a5aa832 Fix another lint error pep8 didn't catch. 2016-08-08 14:27:40 -04:00
verycarefully
9eda5213c0 Fix up more lint errors. 2016-08-08 14:23:58 -04:00
verycarefully
66d02caeaf Fix lint warnings. 2016-08-08 12:25:41 -04:00
verycarefully
3ba5dbf23f Opt-in behavior to ignore system proxies. 2016-08-08 12:09:38 -04:00
Timothy Sutton
1cfb4249bc Fix wrong uninstallXML info generated for new "updated" HD installers
- Use `prodVersion` from optionXML.xml instead of `ProductVersion` from Application.json
2016-08-04 16:58:26 -04:00
Greg Neagle
97957434d5 installer.py: fix call to install() that had incorrect parameters. Addresses #645 2016-08-04 10:40:09 -07:00
Timothy Sutton
c03bb70f7e Fix PEP8 errors for #641 2016-08-03 10:54:52 -04:00
Greg Neagle
40309f5706 Add/update doc strings for munkicommon.ManagedInstallsPreferences and munkicommon.SecureManagedInstallsPreferences to better explain their actual behavior, which may not be obvious/intuitive at first glance. 2016-07-29 07:28:43 -07:00
Greg Neagle
49457d5aa2 Revert "Fix SecureManagedInstallsPreferences implementation so it does not write to root's ByHost preferences."
This reverts commit 93b0d079e7.
2016-07-29 07:03:51 -07:00
Timothy Sutton
4c9b1e5c86 Always define 'installs' for Adobe CS/CC packages
- fix crash importing a CCP pkg containing only Acrobat Pro DC, which doesn't currently generate any installs items
2016-07-27 20:28:33 -04:00
Timothy Sutton
07476adaf2 Set display_name and version pkginfo keys for Adobe HD if appropriate
- if we have a CCP package with one HD app, set its `version` and `display_name`keys since we've already extracted these
2016-07-27 20:28:33 -04:00
Timothy Sutton
879339a7ad Don't assume all CC HD packages have a 'Type' key 2016-07-27 20:28:33 -04:00
Timothy Sutton
ff374b176e Generate installs items for RIBS and HD in the same code section
- we need to create an installs array for either installs type but we can have any combination of the two, so create it up front so ordering doesn't matter
2016-07-27 20:28:33 -04:00