Skip to content

Commit

Permalink
Fix variable accesses to main() method
Browse files Browse the repository at this point in the history
The change of the CLI tools to a main() method changes the scope of some
variables. Fix these.

Signed-off-by: Rob Herring <[email protected]>
  • Loading branch information
robherring committed Nov 10, 2023
1 parent 7a2305d commit a8b7501
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion dtschema/doc_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def sigint_handler(signum, frame):
import glob

line_number = False
verbose = False

def check_doc(filename):
ret = 0
Expand All @@ -30,7 +31,7 @@ def check_doc(filename):

try:
for error in sorted(dtsch.iter_errors(), key=lambda e: e.linecol):
print(dtschema.format_error(filename, error, verbose=args.verbose), file=sys.stderr)
print(dtschema.format_error(filename, error, verbose=verbose), file=sys.stderr)
ret = 1
except:
raise
Expand All @@ -42,6 +43,9 @@ def check_doc(filename):
return ret

def main():
global verbose
global line_number

ap = argparse.ArgumentParser(fromfile_prefix_chars='@',
epilog='Arguments can also be passed in a file prefixed with a "@" character.')
ap.add_argument("yamldt", nargs='*', type=str,
Expand All @@ -54,6 +58,7 @@ def main():
args = ap.parse_args()

line_number=args.line_number
verbose = args.verbose

ret = 0
for f in args.yamldt:
Expand Down
2 changes: 1 addition & 1 deletion dtschema/dtb_validate.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def check_node(self, tree, node, disabled, nodename, fullname, filename):
print(dtschema.format_error(filename, error, nodename=nodename, verbose=verbose),
file=sys.stderr)
except RecursionError as e:
print(ap.prog + ": recursion error: Check for prior errors in a referenced schema", file=sys.stderr)
print(os.path.basename(sys.argv[0]) + ": recursion error: Check for prior errors in a referenced schema", file=sys.stderr)

def check_subtree(self, tree, subtree, disabled, nodename, fullname, filename):
if nodename.startswith('__'):
Expand Down

0 comments on commit a8b7501

Please sign in to comment.