diff options
author | Florian Weimer <fw@deneb.enyo.de> | 2005-09-12 17:12:08 +0000 |
---|---|---|
committer | Florian Weimer <fw@deneb.enyo.de> | 2005-09-12 17:12:08 +0000 |
commit | c87886c8df3b9500472cc7feb747c0e5f0fed718 (patch) | |
tree | 0a2e28d8da6d9fb74bf4b11391aeaba25da45fdf /bin/check-syntax | |
parent | 62c803833b2bd10fe35e6834dec42e584f346a2c (diff) |
lib/python/debian_support.py (ParseError):
Add class.
lib/python/debian_support.py (PackageFile.raiseSyntaxError):o
Raise ParseError instead of SyntaxError.
bin/check-syntax, bin/update-bug-list-db:
Handle the ParseError exception gracefully.
lib/python/bugs.py (CVEFile.matchHeader):
Check parentheses/brackets.
data/CAN/list:
Fix uncovered syntax errors.
git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@1937 e39458fd-73e7-0310-bf30-c45bca0a0e42
Diffstat (limited to 'bin/check-syntax')
-rwxr-xr-x | bin/check-syntax | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/bin/check-syntax b/bin/check-syntax index c6005d22be..d996ae3664 100755 --- a/bin/check-syntax +++ b/bin/check-syntax @@ -19,23 +19,28 @@ def setup_paths(): root_path = setup_paths() import bugs +import debian_support def do_parse(f): names = {} errors = False - for r in f: - n = r.name - if n[0:4] in ('CAN', 'CVE'): - n = n[4:] - if names.has_key(n): - if names[n] <> r.name: - sys.stderr.write("error: duplicate CVE entry: %s and %s\n" - % (names[n], r.name)) - else: - sys.stderr.write("error: duplicate CVE entry: %s\n" - % r.name) - errors = True - names[n] = r.name + try: + for r in f: + n = r.name + if n[0:4] in ('CAN', 'CVE'): + n = n[4:] + if names.has_key(n): + if names[n] <> r.name: + sys.stderr.write("error: duplicate CVE entry: %s and %s\n" + % (names[n], r.name)) + else: + sys.stderr.write("error: duplicate CVE entry: %s\n" + % r.name) + errors = True + names[n] = r.name + except debian_support.ParseError, e: + e.printOut(sys.stderr) + errors = True if errors: sys.exit(1) |