diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-18 20:58:07 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-18 21:09:52 +0530 |
| commit | 62c401fe15480d90e0db086607107dacb0a93b5c (patch) | |
| tree | 7ec745af859318088266f72989a9d9050a3abe48 | |
| parent | 779ed5642ea85dc2cbec4db8b5250b208d8121aa (diff) | |
cerbero: Fix universal build merge on macOS 10.12
With macOS 10.12, file never outputs 'ERROR'. When it isn't sure what
a file is, it outputs hex code describing the file. If we can't figure
out what a file is and it seems to be a header, just copy it.
| -rw-r--r-- | cerbero/tools/osxuniversalgenerator.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cerbero/tools/osxuniversalgenerator.py b/cerbero/tools/osxuniversalgenerator.py index 4383c1ab..b8e81818 100644 --- a/cerbero/tools/osxuniversalgenerator.py +++ b/cerbero/tools/osxuniversalgenerator.py @@ -130,7 +130,8 @@ class OSXUniversalGenerator(object): action = ft[1] break if not action: - if ftype.startswith('ERROR') and f.endswith('.h'): + # Sometimes `file` barfs on header files, so fallback to a copy + if f.endswith('.h'): action = 'copy' else: raise Exception, 'Unexpected file type %s %s' % (str(ftype), f) |