From 4aa0b745da748a743d753eacaa66c757c4520ef1 Mon Sep 17 00:00:00 2001
From: Dave Cornejo <dave@dogwood.com>
Date: Wed, 5 Aug 2020 09:58:48 -1000
Subject: [PATCH] sort the XML before dumping when using -q switch

---
 apps/backend/backend_commit.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 6645dc73..9262d8a0 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -215,7 +215,25 @@ startup_common(clicon_handle       h,
 	    goto fail;
     }
     /* Print upgraded db: -q backend switch */
-    if (clicon_quit_upgrade_get(h) == 1){ 	
+    if (clicon_quit_upgrade_get(h) == 1){
+	/* bind yang */
+	if (ret = (xml_bind_yang(xt, YB_MODULE, yspec, &xret) < 1)){
+	    if (ret == 0){
+		/* invalid */
+		clicon_err(OE_XML, EFAULT, "invalid configuration");
+	    }
+	    else {
+		/* error */
+		xml_print(stderr, xret);
+		clicon_err(OE_XML, 0, "%s: YANG binding error", __func__);
+	    }
+	    exit(0);
+	}
+	/* sort yang */
+	if (xml_sort_recurse(xt) < 0) {
+	    clicon_err(OE_XML, EFAULT, "Yang sort error");
+	    exit(0);
+        }
 	if (xmldb_dump(h, stdout, xt) < 0)
 	    goto done;
 	exit(0);  /* This is fairly abrupt , but need to avoid side-effects of rewinding