tmpfiles: nicer message when two or more conflicting lines are configured for the same file

2011-01-05 16:11:15 +01:00
parent 5f7c426e2a
commit 022707d961
1 changed files with 6 additions and 0 deletions
@@ -591,6 +591,12 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, cons
        }

        if ((r = hashmap_put(items, i->path, i)) < 0) {
+                if (r == -EEXIST) {
+                        log_warning("Two or more conflicting lines for %s configured, ignoring.", i->path);
+                        r = 0;
+                        goto finish;
+                }
+
                log_error("Failed to insert item %s: %s", i->path, strerror(-r));
                goto finish;
        }