From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Dec 2014 18:08:50 +0000 (+0100)
Subject: machined: ignore spurious error
X-Git-Tag: v219~760
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e5f5b5b9c92d59ef3cb5169982cb6f436c9206fa

machined: ignore spurious error
---

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 26ce8fe11..bbb4ae2de 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2111,9 +2111,10 @@ int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdat
                 return 0;
 
         r = unit_name_from_dbus_path(path, &unit);
+        if (r == -EINVAL) /* not a unit */
+                return 0;
         if (r < 0)
-                /* quietly ignore non-units paths */
-                return r == -EINVAL ? 0 : r;
+                return r;
 
         session = hashmap_get(m->session_units, unit);
         if (session)
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 94dd128ec..b894e0b44 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -738,6 +738,8 @@ int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdat
                 return 0;
 
         r = unit_name_from_dbus_path(path, &unit);
+        if (r == -EINVAL) /* not for a unit */
+                return 0;
         if (r < 0)
                 return r;