|
 |
1d4c55 |
commit d33705c0b020632274318323931695a99753b5be
|
|
|
1d4c55 |
Author: Florian Weimer <fweimer@redhat.com>
|
|
|
1d4c55 |
Date: Thu Nov 3 12:24:17 2022 +0100
|
|
|
1d4c55 |
|
|
|
1d4c55 |
scripts/glibcelf.py: Properly report <elf.h> parsing failures
|
|
|
1d4c55 |
|
|
|
1d4c55 |
Without this change, parse failures result in an exception:
|
|
|
1d4c55 |
|
|
|
1d4c55 |
Traceback (most recent call last):
|
|
|
1d4c55 |
File "tst-glibcelf.py", line 23, in <module>
|
|
|
1d4c55 |
import glibcelf
|
|
|
1d4c55 |
File "/path/to/git/scripts/glibcelf.py", line 226, in <module>
|
|
|
1d4c55 |
_elf_h = _parse_elf_h()
|
|
|
1d4c55 |
File "/path/to/git/scripts/glibcelf.py", line 221, in _parse_elf_h
|
|
|
1d4c55 |
result = glibcpp.macro_eval(glibcpp.macro_definitions(tokens), reporter)
|
|
|
1d4c55 |
File "/path/to/git/scripts/glibcpp.py", line 379, in macro_eval
|
|
|
1d4c55 |
reporter.error(md.line, 'macro {} redefined'.format(md.name))
|
|
|
1d4c55 |
File "/path/to/git/scripts/glibcelf.py", line 214, in error
|
|
|
1d4c55 |
errors += 1
|
|
|
1d4c55 |
UnboundLocalError: local variable 'errors' referenced before assignment
|
|
|
1d4c55 |
|
|
|
1d4c55 |
diff --git a/scripts/glibcelf.py b/scripts/glibcelf.py
|
|
|
1d4c55 |
index 420cb21943b28bba..59aab56ecf9deb3e 100644
|
|
|
1d4c55 |
--- a/scripts/glibcelf.py
|
|
|
1d4c55 |
+++ b/scripts/glibcelf.py
|
|
|
1d4c55 |
@@ -211,7 +211,7 @@ def _parse_elf_h():
|
|
|
1d4c55 |
self.errors = 0
|
|
|
1d4c55 |
|
|
|
1d4c55 |
def error(self, line, message):
|
|
|
1d4c55 |
- errors += 1
|
|
|
1d4c55 |
+ self.errors += 1
|
|
|
1d4c55 |
print('{}:{}: error: {}'.format(path, line, message))
|
|
|
1d4c55 |
|
|
|
1d4c55 |
def note(self, line, message):
|