Systemd/test/hwdb/10-bad.hwdb at d3aeddb8d19b9bb992ffea6f7a514d90ba697bb9 - picnoir/Systemd - Alternativebit

picnoir/Systemd

Zbigniew Jędrzejewski-Szmek 49141e0cd1 hwdb: improve and test syntax error messages

Since syntax error are non-fatal, downgrade them to warnings.
Use log_syntax to have uniform formatting including the line number.
State machine states like DATA and MATCH are internal, user-facing
messages should use the names from hwdb(7): match, property, record.
Also change "key/value" to "key-value", since there's no alternative
here, both parts must be present.

[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:2] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:5] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:9] Property expected, ignoring record with no properties
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:11] Key/value pair expected but got " NO_VALUE", ignoring
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:18] Property or empty line expected, got "BAD:7:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:22] Property or empty line expected, got "BAD:8:match at wrong place", ignoring record
[/tmp/tmp.KFwEhm74n4/etc/udev/hwdb.d/10-bad.hwdb:23] Match expected but got indented property " Z=z", ignoring line

squash! hwdb: improve syntax error messages

2016-12-01 11:56:50 -05:00

27 lines

340 B

Plaintext

Raw Blame History

 BAD:1:no properties
 BAD:2:no properties
 BAD:2:no properties
 BAD:3:no properties
 BAD:3:no properties
 BAD:3:no properties
 GOOD:5:bad property
  NO_VALUE
 GOOD:6:bad property
  =NO_NAME
  NO_VALUE=
 BAD:7:match at wrong place
  X=Y
 BAD:7:match at wrong place
 BAD:8:match at wrong place
  X=Y
 BAD:8:match at wrong place
  Z=z
 BAD:8:match at EOF