]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-old-fileconflicts-behaviour.patch
- updated perl-macros patch to handle different forms of "require version" deps
[packages/rpm.git] / rpm-old-fileconflicts-behaviour.patch
1 --- rpm/lib/poptI.c.orig        2007-07-24 16:36:47.000000000 +0200
2 +++ rpm/lib/poptI.c     2007-10-02 15:11:29.213848100 +0200
3 @@ -17,7 +17,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 @@ -275,10 +275,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 -
20   { "freshen", 'F', POPT_BIT_SET, &rpmIArgs.installInterfaceFlags,
21         (INSTALL_UPGRADE|INSTALL_FRESHEN|INSTALL_INSTALL),
22         N_("upgrade package(s) if already installed"),
23
This page took 0.023964 seconds and 3 git commands to generate.