mirror of
https://git.proxmox.com/git/systemd
synced 2026-02-03 14:24:11 +00:00
87c3557857
This commit was created using the following commands and then fixing up debian/patches/series manually. $ git config diff.renames false $ git rebase --onto debian/208-5 v208 stable/v208-stable $ git checkout -b patch-queue/experimental HEAD $ gbp-pq export --no-patch-numbers $ git add --ignore-removal debian/patches/
26 lines
700 B
Diff
26 lines
700 B
Diff
From: Shawn Landden <shawn@churchofgit.com>
|
|
Date: Tue, 10 Dec 2013 09:28:26 -0800
|
|
Subject: core/manager: remove infinite loop
|
|
|
|
(cherry picked from commit 145b1f799ff6712f333cef92c44218254a1320c5)
|
|
---
|
|
src/core/manager.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
index 944c196..a34a3c6 100644
|
|
--- a/src/core/manager.c
|
|
+++ b/src/core/manager.c
|
|
@@ -2285,10 +2285,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
|
|
}
|
|
|
|
finish:
|
|
- if (ferror(f)) {
|
|
+ if (ferror(f))
|
|
r = -EIO;
|
|
- goto finish;
|
|
- }
|
|
|
|
assert(m->n_reloading > 0);
|
|
m->n_reloading --;
|