From 022707d96113accf6898b0a59be3a3acde2c6832 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 5 Jan 2011 16:11:15 +0100
Subject: tmpfiles: nicer message when two or more conflicting lines are
 configured for the same file

---
 src/tmpfiles.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 1234cbf348..984eaf0de1 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;
         }
-- 
cgit v1.2.3-54-g00ecf