projects
/
tools
/
librpm-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7bc9cc7
)
Lose useless --fileconflicts cli-switch
author
Panu Matilainen
<pmatilai@redhat.com>
Tue, 9 Nov 2010 07:27:55 +0000
(09:27 +0200)
committer
Panu 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
patch
|
blob
|
history
diff --git
a/lib/poptI.c
b/lib/poptI.c
index
3cbff01
..
4cbc923
100644
(file)
--- a/
lib/poptI.c
+++ b/
lib/poptI.c
@@
-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},