]>
Commit | Line | Data |
---|---|---|
9282ffe4 AF |
1 | --- rpm-5.2.0/lib/poptI.c.wiget 2009-04-12 03:25:45.000000000 +0200 |
2 | +++ rpm-5.2.0/lib/poptI.c 2010-04-25 22:59:14.467664549 +0200 | |
3 | @@ -21,7 +21,7 @@ extern time_t get_date(const char * p, v | |
ed809d1d | 4 | /*@-fullinitblock@*/ |
0de0d9a2 | 5 | /*@unchecked@*/ |
ed809d1d | 6 | struct rpmQVKArguments_s rpmIArgs = { |
9282ffe4 AF |
7 | -#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */ |
8 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */ | |
9 | .probFilter = RPMPROB_FILTER_NONE, | |
10 | #else | |
11 | .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), |