summaryrefslogtreecommitdiff
path: root/lib/northbound.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/northbound.c')
-rw-r--r--lib/northbound.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/northbound.c b/lib/northbound.c
index a3d91e56af..6b31b818c5 100644
--- a/lib/northbound.c
+++ b/lib/northbound.c
@@ -391,11 +391,14 @@ void nb_config_replace(struct nb_config *config_dst,
static inline int nb_config_cb_compare(const struct nb_config_cb *a,
const struct nb_config_cb *b)
{
- /* Sort by priority first. */
+ /*
+ * Sort by priority first. If the operation is "destroy", reverse the
+ * order, so that the dependencies are destroyed before the dependants.
+ */
if (a->nb_node->priority < b->nb_node->priority)
- return -1;
+ return a->operation != NB_CB_DESTROY ? -1 : 1;
if (a->nb_node->priority > b->nb_node->priority)
- return 1;
+ return a->operation != NB_CB_DESTROY ? 1 : -1;
/*
* Preserve the order of the configuration changes as told by libyang.