X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=manager.c;h=688d9fa65b28e831217faee879cf4977a241006f;hb=136337ff74f05be3d42a769d9f0cb99716c5c40f;hp=767533484ea09bf4685ef33895368e14ef99d187;hpb=94b6dfa24f84bd8854c1dc566413b0719dce9e0d;p=elogind.git

diff --git a/manager.c b/manager.c
index 767533484..688d9fa65 100644
--- a/manager.c
+++ b/manager.c
@@ -1563,7 +1563,7 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un
 
         if ((ret = manager_get_unit(m, name))) {
                 *_ret = ret;
-                return 0;
+                return 1;
         }
 
         if (!(ret = unit_new(m)))
@@ -1582,6 +1582,7 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un
 
         unit_add_to_load_queue(ret);
         unit_add_to_dbus_queue(ret);
+        unit_add_to_gc_queue(ret);
 
         if (_ret)
                 *_ret = ret;
@@ -1590,7 +1591,6 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un
 }
 
 int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret) {
-        Unit *ret;
         int r;
 
         assert(m);
@@ -1598,13 +1598,13 @@ int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_re
         /* This will load the service information files, but not actually
          * start any services or anything. */
 
-        if ((r = manager_load_unit_prepare(m, name, path, &ret)) < 0)
+        if ((r = manager_load_unit_prepare(m, name, path, _ret)) != 0)
                 return r;
 
         manager_dispatch_load_queue(m);
 
         if (_ret)
-                *_ret = unit_follow_merge(ret);
+                *_ret = unit_follow_merge(*_ret);
 
         return 0;
 }
@@ -1949,19 +1949,19 @@ int manager_loop(Manager *m) {
                         sleep(1);
                 }
 
-                if (manager_dispatch_cleanup_queue(m) > 0)
+                if (manager_dispatch_load_queue(m) > 0)
                         continue;
 
-                if (manager_dispatch_gc_queue(m) > 0)
+                if (manager_dispatch_run_queue(m) > 0)
                         continue;
 
-                if (manager_dispatch_load_queue(m) > 0)
+                if (bus_dispatch(m) > 0)
                         continue;
 
-                if (manager_dispatch_run_queue(m) > 0)
+                if (manager_dispatch_cleanup_queue(m) > 0)
                         continue;
 
-                if (bus_dispatch(m) > 0)
+                if (manager_dispatch_gc_queue(m) > 0)
                         continue;
 
                 if (manager_dispatch_dbus_queue(m) > 0)