[systemd-commits] src/tmpfiles

[Lukas Nykryn]

 src/tmpfiles/tmpfiles.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit f58ceb21e9cdc4b79586283743351750ae35c175
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Thu Jan 9 18:00:50 2014 +0100

    tmpfiles: don't allow label_fix to print ENOENT when we want to ignore it

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index dde7d33..bff9527 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -436,8 +436,6 @@ finish:
 }
 
 static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) {
-        int r;
-
         /* not using i->path directly because it may be a glob */
         if (i->mode_set)
                 if (chmod(path, i->mode) < 0) {
@@ -458,8 +456,7 @@ static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) {
                         }
                 }
 
-        r = label_fix(path, false, false);
-        return r == -ENOENT && ignore_enoent ? 0 : r;
+        return label_fix(path, ignore_enoent, false);
 }
 
 static int item_set_perms(Item *i, const char *path) {