chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
d6ea93e
)
unit_merge() needs a proper review
author
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jan 2010 01:00:07 +0000
(
02:00
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 28 Jan 2010 01:00:07 +0000
(
02:00
+0100)
unit.c
patch
|
blob
|
history
diff --git
a/unit.c
b/unit.c
index e8d61c853c51529c3fb2b9c4f0917b833632bd73..88615319d7c28ee64e1db4a84abe0836c5ebddd9 100644
(file)
--- a/
unit.c
+++ b/
unit.c
@@
-243,7
+243,8
@@
static int ensure_merge(Set **s, Set *other) {
return 0;
}
-/* FIXME: Does not rollback on failure! */
+/* FIXME: Does not rollback on failure! Needs to fix special unit
+ * pointers. Needs to merge names and dependencies properly.*/
int unit_merge(Unit *u, Unit *other) {
int r;
UnitDependency d;