]> TLD Linux GIT Repositories - packages/rpm.git/blob - rpm-old-fileconflicts-behaviour.patch
- fix trigger flag int type check
[packages/rpm.git] / rpm-old-fileconflicts-behaviour.patch
1 --- rpm-4.4.4/lib/poptI.c.orig  2005-11-27 13:50:16.000000000 +0000
2 +++ rpm-4.4.4/lib/poptI.c       2005-12-28 02:43:01.029574304 +0000
3 @@ -16,7 +16,7 @@
4  /*@-fullinitblock@*/
5  /*@unchecked@*/
6  struct rpmQVKArguments_s rpmIArgs = {
7 -    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
8 +    .probFilter = 0,
9  };
10  /*@=fullinitblock@*/
11  
12 @@ -274,9 +273,6 @@
13         N_("skip files with leading component <path> "),
14         N_("<path>") },
15  
16 - { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter,
17 -       (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
18 -       N_("detect file conflicts between packages"), NULL},
19   { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
20         N_("short hand for --replacepkgs --replacefiles"), NULL},
21