From f5d2150e9db9205a9f208d4144b6d0381f877ad3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 21 Nov 2007 11:25:50 -0600 Subject: Remove -F/--freshen operation This operation made sense in the days before sync DBs existed, but it no longer has the same usefulness it once did. Signed-off-by: Dan McGee Signed-off-by: Chantry Xavier Signed-off-by: Nagy Gabor Signed-off-by: Aaron Griffin --- src/pacman/pacman.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/pacman') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 31d31da1..10f4c24b 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -71,7 +71,6 @@ static void usage(int op, const char * const myname) printf(" %s {-h --help}\n", myname); printf(" %s {-V --version}\n", myname); printf(" %s {-A --add} [%s] <%s>\n", myname, str_opt, str_file); - printf(" %s {-F --freshen} [%s] <%s>\n", myname, str_opt, str_file); printf(" %s {-Q --query} [%s] [%s]\n", myname, str_opt, str_pkg); printf(" %s {-R --remove} [%s] <%s>\n", myname, str_opt, str_pkg); printf(" %s {-S --sync} [%s] [%s]\n", myname, str_opt, str_pkg); @@ -93,11 +92,7 @@ static void usage(int op, const char * const myname) printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); } else if(op == PM_OP_UPGRADE) { - if(config->flags & PM_TRANS_FLAG_FRESHEN) { - printf("%s: %s {-F --freshen} [%s] <%s>\n", str_usg, myname, str_opt, str_file); - } else { - printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); - } + printf("%s: %s {-U --upgrade} [%s] <%s>\n", str_usg, myname, str_opt, str_file); printf("%s:\n", str_opt); printf(_(" --asdeps install packages as non-explicitly installed\n")); printf(_(" -d, --nodeps skip dependency checks\n")); @@ -266,7 +261,6 @@ static int parseargs(int argc, char *argv[]) static struct option opts[] = { {"add", no_argument, 0, 'A'}, - {"freshen", no_argument, 0, 'F'}, {"query", no_argument, 0, 'Q'}, {"remove", no_argument, 0, 'R'}, {"sync", no_argument, 0, 'S'}, @@ -387,10 +381,6 @@ static int parseargs(int argc, char *argv[]) FREELIST(list); break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; - case 'F': - config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); - config->flags |= PM_TRANS_FLAG_FRESHEN; - break; case 'Q': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_QUERY); break; case 'R': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_REMOVE); break; case 'S': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_SYNC); break; -- cgit v1.2.3-70-g09d2