From d4560dfd0d5c93c82a54451b50972d1ce2907995 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 3 Apr 2021 20:10:38 +0000
Subject: uninstall mode: always respect the SLBT_DRIVER_ANNOTATE_NEVER flag.

---
 src/logic/slbt_exec_uninstall.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/logic/slbt_exec_uninstall.c b/src/logic/slbt_exec_uninstall.c
index fa0e896..28a73b2 100644
--- a/src/logic/slbt_exec_uninstall.c
+++ b/src/logic/slbt_exec_uninstall.c
@@ -25,7 +25,8 @@ static int slbt_uninstall_usage(
 	const char *			program,
 	const char *			arg,
 	const struct argv_option **	optv,
-	struct argv_meta *		meta)
+	struct argv_meta *		meta,
+	int				noclr)
 {
 	char header[512];
 
@@ -34,7 +35,16 @@ static int slbt_uninstall_usage(
 		"Options:\n",
 		program);
 
-	argv_usage(fdout,header,optv,arg);
+	switch (noclr) {
+		case 0:
+			argv_usage(fdout,header,optv,arg);
+			break;
+
+		default:
+			argv_usage_plain(fdout,header,optv,arg);
+			break;
+	}
+
 	argv_free(meta);
 
 	return SLBT_USAGE;
@@ -284,7 +294,8 @@ int slbt_exec_uninstall(
 		return slbt_uninstall_usage(
 			fdout,
 			dctx->program,
-			0,optv,0);
+			0,optv,0,
+			dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER);
 
 	/* <uninstall> argv meta */
 	if (!(meta = argv_get(
@@ -337,7 +348,8 @@ int slbt_exec_uninstall(
 		slbt_uninstall_usage(
 			fdout,
 			dctx->program,
-			0,optv,meta);
+			0,optv,meta,
+			dctx->cctx->drvflags & SLBT_DRIVER_ANNOTATE_NEVER);
 		return 0;
 	}
 
-- 
cgit v1.2.3