Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-08-11 09:18:55 -0400
committerDan McGee <dan@archlinux.org>2011-08-11 11:29:49 -0500
commit6e4f695a0f583a832e616034db59779444d86d69 (patch)
treee56da045932bc57b18c6a505be0b9ab1ffa1239d
parent725edde73fb16564b0ce33257d7a069b10eb8cea (diff)
pacman: remove --dbonly shortopt
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@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/pacman.8.txt2
-rw-r--r--src/pacman/conf.h3
-rw-r--r--src/pacman/pacman.c6
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 10368df4..2a640f8f 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 33a87983..396cde5a 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 f7ea3fb5..71413bdd 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -189,7 +189,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"));
@@ -488,7 +488,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;
@@ -600,7 +600,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'},
@@ -636,6 +635,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}
};