[packages/rpm.git] / rpm-old-fileconflicts-behaviour.patch

--- rpm-4.4.4/lib/poptI.c.orig	2005-11-27 13:50:16.000000000 +0000
+++ rpm-4.4.4/lib/poptI.c	2005-12-28 02:43:01.029574304 +0000
@@ -16,7 +16,7 @@
 /*@-fullinitblock@*/
 /*@unchecked@*/
 struct rpmQVKArguments_s rpmIArgs = {
-    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
+    .probFilter = 0,
 };
 /*@=fullinitblock@*/
 
@@ -274,9 +273,6 @@
 	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},
Commit	Line	Data
0de0d9a2 PS	1	--- rpm-4.4.4/lib/poptI.c.orig 2005-11-27 13:50:16.000000000 +0000
0de0d9a2 PS	2	+++ rpm-4.4.4/lib/poptI.c 2005-12-28 02:43:01.029574304 +0000
ed809d1d AM	3	@@ -16,7 +16,7 @@
ed809d1d AM	4	/@-fullinitblock@/
0de0d9a2	5	/@unchecked@/
ed809d1d AM	6	struct rpmQVKArguments_s rpmIArgs = {
	7	- .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES \| RPMPROB_FILTER_REPLACENEWFILES),
	8	+ .probFilter = 0,
	9	};
	10	/@=fullinitblock@/
	11
0de0d9a2 PS	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