diff --git a/src/core/unit.c b/src/core/unit.c index 0d52e4bf1a..ea09416be5 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1165,11 +1165,6 @@ int unit_merge(Unit *u, Unit *other) { if (r < 0) return r; - /* Merge names */ - r = unit_merge_names(u, other); - if (r < 0) - return r; - /* Redirect all references */ while (other->refs_by_target) unit_ref_set(other->refs_by_target, other->refs_by_target->source, u); @@ -1177,6 +1172,11 @@ int unit_merge(Unit *u, Unit *other) { /* Merge dependencies */ unit_merge_dependencies(u, other); + /* Merge names. It is better to do that after merging deps, otherwise the log message contains n/a. */ + r = unit_merge_names(u, other); + if (r < 0) + return r; + other->load_state = UNIT_MERGED; other->merged_into = u;