Lose useless --fileconflicts cli-switch
authorPanu Matilainen <pmatilai@redhat.com>
Tue, 9 Nov 2010 07:27:55 +0000 (09:27 +0200)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 9 Nov 2010 07:27:55 +0000 (09:27 +0200)
- We always detect file conflicts (duh!) unless forced, no need for this

lib/poptI.c

index 3cbff01..4cbc923 100644 (file)
@@ -147,9 +147,6 @@ struct poptOption rpmInstallPoptTable[] = {
        N_("skip files with leading component <path> "),
        N_("<path>") },
 
- { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter,
-       (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-       N_("detect file conflicts between packages"), NULL},
  { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
        N_("short hand for --replacepkgs --replacefiles"), NULL},