From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Oct 2010 00:19:21 +0000 (+0200)
Subject: unit: suppress incorrect deserialization errors
X-Git-Tag: v12~126
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8aaf019b5ce1a024090350d881739d28fd3b47d4

unit: suppress incorrect deserialization errors
---

diff --git a/src/unit.c b/src/unit.c
index 0e9325dfa..fd9bdae1a 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -2087,14 +2087,19 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                                 u->meta.deserialized_job = type;
 
                         continue;
-                } else if (streq(l, "inactive-exit-timestamp"))
+                } else if (streq(l, "inactive-exit-timestamp")) {
                         dual_timestamp_deserialize(f, v, &u->meta.inactive_exit_timestamp);
-                else if (streq(l, "active-enter-timestamp"))
+                        continue;
+                } else if (streq(l, "active-enter-timestamp")) {
                         dual_timestamp_deserialize(f, v, &u->meta.active_enter_timestamp);
-                else if (streq(l, "active-exit-timestamp"))
+                        continue;
+                } else if (streq(l, "active-exit-timestamp")) {
                         dual_timestamp_deserialize(f, v, &u->meta.active_exit_timestamp);
-                else if (streq(l, "inactive-enter-timestamp"))
+                        continue;
+                } else if (streq(l, "inactive-enter-timestamp")) {
                         dual_timestamp_deserialize(f, v, &u->meta.inactive_enter_timestamp);
+                        continue;
+                }
 
                 if ((r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds)) < 0)
                         return r;