udev_rules_parse_file: do not ignore ENOENT when invoked by udevadm verify

Make sure the ENOENT exception reintroduced by commit
9db7081d83d56cd2523b03f9eb9d67ef1c93c55f is not applied when the parser
is invoked by udevadm verify.

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index a019f64c6c7e9e1fbe8ab82b491c9aadd7a58cd6..bbdd498cd718f5fcf3e0e928b95e548d02907733 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1437,7 +1437,7 @@ int udev_rules_parse_file(UdevRules *rules, const char *filename, bool extra_che
 
         f = fopen(filename, "re");
         if (!f) {
-                if (errno == ENOENT)
+                if (!extra_checks && errno == ENOENT)
                         return 0;
 
                 return log_warning_errno(errno, "Failed to open %s, ignoring: %m", filename);

diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh
index ba21c9ab87a22ff5b24ca927a8a7a8d5a95a44c4..e3a96e5cdb7e734cea1847bff63e84fad0625802 100755 (executable)
--- a/test/units/testsuite-17.11.sh
+++ b/test/units/testsuite-17.11.sh
@@ -97,6 +97,8 @@ assert_1 --resolve-names=now
 # Failed to parse rules file .: Is a directory
 cp "${workdir}/default_output_1_fail" "${exo}"
 assert_1 .
+# Failed to parse rules file ./nosuchfile: No such file or directory
+assert_1 ./nosuchfile
 # Failed to parse rules file .: Is a directory
 cat >"${exo}" <<EOF