From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 5 Jan 2011 15:11:15 +0000 (+0100)
Subject: tmpfiles: nicer message when two or more conflicting lines are configured for the... 
X-Git-Tag: v16~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=022707d96113accf6898b0a59be3a3acde2c6832

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

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 1234cbf34..984eaf0de 100644
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -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;
         }