diff options
| -rwxr-xr-x | scripts/spdxcheck.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index 5056fb3b897d..e559c6294c39 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py | |||
| @@ -168,6 +168,7 @@ class id_parser(object): | |||
| 168 | self.curline = 0 | 168 | self.curline = 0 |
| 169 | try: | 169 | try: |
| 170 | for line in fd: | 170 | for line in fd: |
| 171 | line = line.decode(locale.getpreferredencoding(False), errors='ignore') | ||
| 171 | self.curline += 1 | 172 | self.curline += 1 |
| 172 | if self.curline > maxlines: | 173 | if self.curline > maxlines: |
| 173 | break | 174 | break |
| @@ -249,12 +250,13 @@ if __name__ == '__main__': | |||
| 249 | 250 | ||
| 250 | try: | 251 | try: |
| 251 | if len(args.path) and args.path[0] == '-': | 252 | if len(args.path) and args.path[0] == '-': |
| 252 | parser.parse_lines(sys.stdin, args.maxlines, '-') | 253 | stdin = os.fdopen(sys.stdin.fileno(), 'rb') |
| 254 | parser.parse_lines(stdin, args.maxlines, '-') | ||
| 253 | else: | 255 | else: |
| 254 | if args.path: | 256 | if args.path: |
| 255 | for p in args.path: | 257 | for p in args.path: |
| 256 | if os.path.isfile(p): | 258 | if os.path.isfile(p): |
| 257 | parser.parse_lines(open(p), args.maxlines, p) | 259 | parser.parse_lines(open(p, 'rb'), args.maxlines, p) |
| 258 | elif os.path.isdir(p): | 260 | elif os.path.isdir(p): |
| 259 | scan_git_subtree(repo.head.reference.commit.tree, p) | 261 | scan_git_subtree(repo.head.reference.commit.tree, p) |
| 260 | else: | 262 | else: |
