diff options
author | Jonathan Adams <Jonathan.Adams@Sun.COM> | 2010-08-11 14:15:47 -0700 |
---|---|---|
committer | Jonathan Adams <Jonathan.Adams@Sun.COM> | 2010-08-11 14:15:47 -0700 |
commit | 8276d7915abc7c44934b5701e6ae35ec26eba740 (patch) | |
tree | 82e1fc574ae9a154c9838190954448837ec5394c /usr/src | |
parent | 64a3d88b37ad059e7183a471323dbba883162394 (diff) | |
download | illumos-joyent-8276d7915abc7c44934b5701e6ae35ec26eba740.tar.gz |
6918117 cddlchk should use a more standard error format
Diffstat (limited to 'usr/src')
-rw-r--r-- | usr/src/tools/onbld/Checks/CmtBlk.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/usr/src/tools/onbld/Checks/CmtBlk.py b/usr/src/tools/onbld/Checks/CmtBlk.py index d2ee60e6aa..2f3d29fa79 100644 --- a/usr/src/tools/onbld/Checks/CmtBlk.py +++ b/usr/src/tools/onbld/Checks/CmtBlk.py @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -89,22 +88,22 @@ def cmtblkchk(fh, blk_name, blk_text, filename=None, lic.append(line) if in_cmt: - output.write('Error: Incomplete %s block in file %s\n' - ' at line %s\n''' % (blk_name, filename, start)) + output.write('%s: %s: Error: Incomplete %s block\n''' % + (filename, start, blk_name)) # Check for no comment block, warn if we're not being lenient if not len(blocks) and not lenient: if not ret: ret = 2 - output.write("Warning: No %s block in file %s\n" % - (blk_name, filename)) + output.write("%s: Warning: No %s block\n" % + (filename, blk_name)) # Check for multiple comment blocks if len(blocks) > 1: ret = 1 - output.write('Error: Multiple %s blocks in file %s\n' + output.write('%s: Error: Multiple %s blocks\n' ' at lines %s\n''' % - (blk_name, filename, + (filename, blk_name, ', '.join([str(x['start']) for x in blocks]))) # Validate each comment block @@ -114,16 +113,16 @@ def cmtblkchk(fh, blk_name, blk_text, filename=None, except CmtBlkError, e: ret = 1 output.write( - "Error: Invalid line in %s block in file %s\n" - " at line %d, should be\n" + "%s: %d: Error: Invalid line in %s block:\n" + " should be\n" " '%s'\n" " is\n" - " '%s'\n" % (blk_name, filename, - e.lineno, e.shouldbe, e.seen)) + " '%s'\n" % (filename, e.lineno, blk_name, + e.shouldbe, e.seen)) break if verbose and not ret: - output.write("Message: Valid %s block in file %s\n" % - (blk_name, filename)) + output.write("%s: Valid %s block\n" % + (filename, blk_name)) return ret |