diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-09 12:20:27 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-09 12:20:27 +0000 |
commit | c2e53e4331d7069621f6df5fc7b73c4dbc20ec67 (patch) | |
tree | cb698ee4c299c1e4e354c9b54795f94f92e42760 /usr/src/tools/scripts/git-pbchk.py | |
parent | e3d7b93d28e9956dcafe193469a2149566707527 (diff) | |
parent | 77ac0eaaa1298f1119c62575dcdb2003d56e0994 (diff) | |
download | illumos-joyent-c2e53e4331d7069621f6df5fc7b73c4dbc20ec67.tar.gz |
[illumos-gate merge]
commit 77ac0eaaa1298f1119c62575dcdb2003d56e0994
12160 libdiskstatus: argument to 'alloca' may be too large
commit 7e536b59b5c21c385f301967cb3b7e31d307d131
11982 libmail: cast between incompatible function types
commit 0639c0edfe5fac11628e478be2a3b2d88556fc80
12150 loader: warning: 'alloc_align' attribute ignored on a function returning 'int'
commit 4e5ef1cee66fbfbbd2b3e56b81e2bb5700f4a59e
12156 libsasl: 'prev' may be used uninitialized in this function
commit 1081175181bc5c4495f7bc7f565bf3af4f1d6085
12171 pbchk traceback when checking .java file under python3
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
-rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index 99bce29087..ec01255c6e 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -21,7 +21,7 @@ # Copyright (c) 2015, 2016 by Delphix. All rights reserved. # Copyright 2016 Nexenta Systems, Inc. # Copyright (c) 2019, Joyent, Inc. -# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2020 OmniOS Community Edition (OmniOSce) Association. # from __future__ import print_function @@ -280,7 +280,7 @@ def jstyle(root, parent, flist, output): ret = 0 output.write("Java style:\n") for f in flist(lambda x: x.endswith('.java')): - with io.open(f, encoding='utf-8', errors='replace') as fh: + with io.open(f, mode='rb') as fh: ret |= JStyle.jstyle(fh, output=output, picky=True) return ret |