[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,8 +16,7 @@
 /*@unchecked@*/
 struct rpmInstallArguments_s rpmIArgs = {
     0,			/* transFlags */
-			/* probFilter */
-    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
+    0,			/* probFilter */
     0,			/* installInterfaceFlags */
     0,			/* eraseInterfaceFlags */
     0,			/* qva_flags */
@@ -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
	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