mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-08 02:09:48 +03:00
utils/get-developers: print error for correct line
Start counting the line numbers in 1 instead of 0, in case an error must be printed. Both the error about a developer entry with no file entry and the error about a file entry with no developer entry actually belong to the non-empty line previous the one being analysed, so in these cases print the line number from the line before. Also count empty and comment lines, so a developer fixing the file can jump to the correct line (or the nearest one). At same time standardize the messages, printing the line number also in the case of a warning for a file that is not in the tree anymore. Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Thomas Petazzoni
parent
5ee1dd85a3
commit
de03312db0
@@ -236,12 +236,13 @@ def parse_developers(filename=None):
|
||||
files = []
|
||||
name = None
|
||||
for line in f:
|
||||
linen += 1
|
||||
line = line.strip()
|
||||
if line.startswith("#"):
|
||||
continue
|
||||
elif line.startswith("N:"):
|
||||
if name is not None or len(files) != 0:
|
||||
print("Syntax error in DEVELOPERS file, line %d" % linen,
|
||||
print("Syntax error in DEVELOPERS file, line %d" % (linen - 1),
|
||||
file=sys.stderr)
|
||||
return None
|
||||
name = line[2:].strip()
|
||||
@@ -249,7 +250,7 @@ def parse_developers(filename=None):
|
||||
fname = line[2:].strip()
|
||||
dev_files = glob.glob(os.path.join(brpath, fname))
|
||||
if len(dev_files) == 0:
|
||||
print("WARNING: '%s' doesn't match any file" % fname,
|
||||
print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen),
|
||||
file=sys.stderr)
|
||||
for f in dev_files:
|
||||
dev_file = os.path.relpath(f, brpath)
|
||||
@@ -267,7 +268,6 @@ def parse_developers(filename=None):
|
||||
print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line),
|
||||
file=sys.stderr)
|
||||
return None
|
||||
linen += 1
|
||||
# handle last developer
|
||||
if name is not None:
|
||||
developers.append(Developer(name, files))
|
||||
|
||||
Reference in New Issue
Block a user