diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-06 12:25:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-02-06 12:25:40 +0000 |
| commit | b1c8633f4b2b1bbf598c0a626b01f7b46f870d78 (patch) | |
| tree | 5c42dd456638b9e4bc03fce222bc34019390a7d5 /usr/src/tools | |
| parent | 63e028448bae2a1090e60d798e9cee9cdfbf7156 (diff) | |
| parent | 972282a0c9782b1780223d9eb8b11cdba5236348 (diff) | |
| download | illumos-joyent-b1c8633f4b2b1bbf598c0a626b01f7b46f870d78.tar.gz | |
[illumos-gate merge]
commit 972282a0c9782b1780223d9eb8b11cdba5236348
10328 git pbchk falls over with no changesets
commit 7106859bbaed16f8e903b56f6d589461e7bfd9fa
6481 mpt_sas failed on sparc
commit 40d76caa635ecc58d52c30c4f19b57963a3e5a51
10336 uts: tem_safe_check_first_time() should query cursor in VIS_PIXEL mode
commit 1e95bfe1233bd7a59421a96c6fa25601561073f3
10334 cleanup smatch errors in usr/src/lib/fm/topo/libtopo
commit 4fe8b4169f2d86d1a437c24b01105d63d7c7bb37
10326 SPARC boot fails with vmem_xalloc(): size overflow
commit 91e105c6fe74c41aa5fec22b6637fa279c68812a
10292 Add percentage unit type to sensor abstraction layer
commit 892ad1623e11186cba8b2eb40d70318d2cb89605
10306 mdb: NULL pointer errors
Conflicts:
usr/src/cmd/mdb/common/modules/mdb_ks/mdb_ks.c
usr/src/cmd/mdb/common/modules/genunix/ctxop.c
Diffstat (limited to 'usr/src/tools')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index e0f3d662d1..dc40a5d222 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -20,7 +20,7 @@ # Copyright 2014 Garrett D'Amore <garrett@damore.org> # Copyright (c) 2015, 2016 by Delphix. All rights reserved. # Copyright 2016 Nexenta Systems, Inc. -# Copyright 2018 Joyent, Inc. +# Copyright (c) 2019, Joyent, Inc. # Copyright 2018 OmniOS Community Edition (OmniOSce) Association. # @@ -125,7 +125,7 @@ def git_parent_branch(branch): if not p: sys.stderr.write("Failed finding git parent branch\n") - sys.exit(err) + sys.exit(1) for line in p: # Git 1.7 will leave a ' ' trailing any non-tracking branch @@ -141,8 +141,8 @@ def git_comments(parent): p = git('log --pretty=tformat:%%B:SEP: %s..' % parent) if not p: - sys.stderr.write("Failed getting git comments\n") - sys.exit(err) + sys.stderr.write("No outgoing changesets found - missing -p option?\n"); + sys.exit(1) return [x.strip() for x in p if x != ':SEP:\n'] @@ -157,7 +157,7 @@ def git_file_list(parent, paths=None): if not p: sys.stderr.write("Failed building file-list from git\n") - sys.exit(err) + sys.exit(1) ret = set() for fname in p: |