[pacman-dev] [PATCH][RFC] pacman: remove --dbonly shortopt

[Dave Reisner]

This is somewhat of a dangerous option with limited use cases. Don't
advertise it as an easily accessibly option.

Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
This also removes -k from double duty with -Q, which might relieve some
confusion.

 doc/pacman.8.txt    |    2 +-
 src/pacman/conf.h   |    3 ++-
 src/pacman/pacman.c |    6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index a362d2c..20e2e99 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -177,7 +177,7 @@ Transaction Options (apply to '-S', '-R' and '-U')
 	dependencies are installed and there are no package conflicts in the
 	system. Specify this option twice to skip all dependency checks.
 
-*-k, \--dbonly*::
+*\--dbonly*::
 	Adds/Removes the database entry only, leaves all files in place.
 
 *\--noprogressbar*::
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 33a8798..396cde5 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -124,7 +124,8 @@ enum {
 	OP_ARCH,
 	OP_PRINTFORMAT,
 	OP_GPGDIR,
-	OP_RECURSIVE
+	OP_RECURSIVE,
+	OP_DBONLY
 };
 
 /* clean method */
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 585c8e0..fee30a2 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -187,7 +187,7 @@ static void usage(int op, const char * const myname)
 				/* pass through */
 			case PM_OP_REMOVE:
 				addlist(_("  -d, --nodeps         skip dependency version checks (-dd to skip all checks)\n"));
-				addlist(_("  -k, --dbonly         only modify database entries, not package files\n"));
+				addlist(_("      --dbonly         only modify database entries, not package files\n"));
 				addlist(_("      --noprogressbar  do not show a progress bar when downloading files\n"));
 				addlist(_("      --noscriptlet    do not execute the install scriptlet if one exists\n"));
 				addlist(_("      --print          print the targets instead of performing the operation\n"));
@@ -486,7 +486,7 @@ static int parsearg_trans(int opt)
 				config->flags |= ALPM_TRANS_FLAG_NODEPVERSION;
 			}
 			break;
-		case 'k': config->flags |= ALPM_TRANS_FLAG_DBONLY; break;
+		case OP_DBONLY: config->flags |= ALPM_TRANS_FLAG_DBONLY; break;
 		case OP_NOPROGRESSBAR: config->noprogressbar = 1; break;
 		case OP_NOSCRIPTLET: config->flags |= ALPM_TRANS_FLAG_NOSCRIPTLET; break;
 		case 'p': config->print = 1; break;
@@ -598,7 +598,6 @@ static int parseargs(int argc, char *argv[])
 		{"groups",     no_argument,       0, 'g'},
 		{"help",       no_argument,       0, 'h'},
 		{"info",       no_argument,       0, 'i'},
-		{"dbonly",     no_argument,       0, 'k'},
 		{"check",      no_argument,       0, 'k'},
 		{"list",       no_argument,       0, 'l'},
 		{"foreign",    no_argument,       0, 'm'},
@@ -634,6 +633,7 @@ static int parseargs(int argc, char *argv[])
 		{"print-format", required_argument, 0, OP_PRINTFORMAT},
 		{"gpgdir",     required_argument, 0, OP_GPGDIR},
 		{"recursive",  no_argument,       0, OP_RECURSIVE},
+		{"dbonly",     no_argument,       0, OP_DBONLY},
 		{0, 0, 0, 0}
 	};
 
-- 
1.7.6