25 lines
880 B
Diff
25 lines
880 B
Diff
From: "Gao,Yan" <ygao@suse.com>
|
|
Date: Wed, 26 Aug 2015 16:28:38 +0200
|
|
Subject: [PATCH] Fix: xml: Mark xml nodes as dirty if any children move
|
|
|
|
Otherwise if nothing else changed in the new xml, even the versions
|
|
weren't bumped, crm_diff would output an empty xml diff.
|
|
|
|
(cherry picked from commit 1073786ec24f3bbf26a0f6a5b0614a65edac4301)
|
|
---
|
|
lib/common/xml.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/lib/common/xml.c b/lib/common/xml.c
|
|
index 299c7bf..353eb4b 100644
|
|
--- a/lib/common/xml.c
|
|
+++ b/lib/common/xml.c
|
|
@@ -4275,6 +4275,7 @@ __xml_diff_object(xmlNode * old, xmlNode * new)
|
|
if(p_old != p_new) {
|
|
crm_info("%s.%s moved from %d to %d - %d",
|
|
new_child->name, ID(new_child), p_old, p_new);
|
|
+ __xml_node_dirty(new);
|
|
p->flags |= xpf_moved;
|
|
|
|
if(p_old > p_new) {
|