]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-old-fileconflicts-behaviour.patch
- get back old fileconflicts behaviour.
[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,8 +16,7 @@
4  /*@unchecked@*/
5  struct rpmInstallArguments_s rpmIArgs = {
6      0,                 /* transFlags */
7 -                       /* probFilter */
8 -    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
9 +    0,                 /* probFilter */
10      0,                 /* installInterfaceFlags */
11      0,                 /* eraseInterfaceFlags */
12      0,                 /* qva_flags */
13 @@ -274,9 +273,6 @@
14         N_("skip files with leading component <path> "),
15         N_("<path>") },
16  
17 - { "fileconflicts", '\0', POPT_BIT_CLR, &rpmIArgs.probFilter,
18 -       (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
19 -       N_("detect file conflicts between packages"), NULL},
20   { "force", '\0', 0, NULL, RPMCLI_POPT_FORCE,
21         N_("short hand for --replacepkgs --replacefiles"), NULL},
22  
This page took 0.033994 seconds and 4 git commands to generate.