diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-30 09:20:15 +0100 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-30 09:20:15 +0100 |
commit | f644a6da7a6f11d20116842e2ce1c7e9c0b0ad64 (patch) | |
tree | 2888ee535b35b08b19df5a8c97c9f53aa06709c5 /hwdb/parse_hwdb.py | |
parent | test: retry checking for transient hostname in hostnamectl (#4769) (diff) | |
download | systemd-f644a6da7a6f11d20116842e2ce1c7e9c0b0ad64.tar.xz systemd-f644a6da7a6f11d20116842e2ce1c7e9c0b0ad64.zip |
parse_hwdb: fix to work with pyparsing 2.1.10
pyparsing 2.1.10 fixed the handling of LineStart to really just apply to line
starts and not ignore whitespace and comments any more. Adjust EMPTYLINE to
this.
Many thanks to Paul McGuire for pointing this out!
Diffstat (limited to 'hwdb/parse_hwdb.py')
-rwxr-xr-x | hwdb/parse_hwdb.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hwdb/parse_hwdb.py b/hwdb/parse_hwdb.py index 5d4c5ea64d..5856d12af7 100755 --- a/hwdb/parse_hwdb.py +++ b/hwdb/parse_hwdb.py @@ -56,7 +56,7 @@ except ImportError: lru_cache = lambda: (lambda f: f) EOL = LineEnd().suppress() -EMPTYLINE = LineStart() + LineEnd() +EMPTYLINE = LineEnd() COMMENTLINE = pythonStyleComment + EOL INTEGER = Word(nums) REAL = Combine((INTEGER + Optional('.' + Optional(INTEGER))) ^ ('.' + INTEGER)) |