From 161f04b32c458ea2ef722a2b8180ad12777a5807 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 6 Oct 2008 15:56:23 +0000
Subject: - urpmi, library:   o handle --replacefiles, will be used by
 mdkonline     (require perl-URPM 3.19)

---
 NEWS            | 3 +++
 pod/urpmi.8.pod | 5 +++++
 urpm/args.pm    | 1 +
 urpm/install.pm | 1 +
 urpmi           | 1 +
 5 files changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index 5260aa23..0a0738ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 - urpmi, rpmdrake:
   o nice exit code for "bad signature" fatal error. Fixes rpmdrake continuing
     on bad signature (#44575)
+- urpmi, library:
+  o handle --replacefiles, will be used by mdkonline
+    (require perl-URPM 3.19)
 - gurpmi:
   o do not exit in --auto mode at end of installation which prevents
     restarting after priority upgrade
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index 979a3249..7d7b9e31 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -358,6 +358,11 @@ system-wide.
 Don't execute the scriptlets.
 This is equivalent to C<rpm --noscripts>.
 
+=item B<--replacefiles>
+
+Ignore file conflicts.
+This is equivalent to C<rpm --noscripts>.
+
 =item B<--skip> I<pattern,...>
 
 You can specify a list of packages which installation should be skipped.
diff --git a/urpm/args.pm b/urpm/args.pm
index 95fda9d2..6af01d4b 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -180,6 +180,7 @@ my %options_spec = (
 	'ignoresize' => sub { $urpm->{options}{ignoresize} = 1 },
 	'ignorearch' => sub { $urpm->{options}{ignorearch} = 1 },
 	noscripts => sub { $urpm->{options}{noscripts} = 1 },
+	replacefiles => sub { $urpm->{options}{replacefiles} = 1 },
 	repackage => sub { $urpm->{options}{repackage} = 1 },
 	'more-choices' => sub { $urpm->{options}{morechoices} = 1 },
 	'expect-install!' => \$::urpm::main_loop::expect_install,
diff --git a/urpm/install.pm b/urpm/install.pm
index 758fe4da..a688135a 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -146,6 +146,7 @@ sub options {
 	nosize => $urpm->{options}{ignoresize},
 	ignorearch => $urpm->{options}{ignorearch},
 	noscripts => $urpm->{options}{noscripts},
+	replacefiles => $urpm->{options}{replacefiles},
     );
 }
 
diff --git a/urpmi b/urpmi
index ca075083..d608ce70 100755
--- a/urpmi
+++ b/urpmi
@@ -138,6 +138,7 @@ usage:
 ") . N("  --ignoresize   - don't verify disk space before installation.
 ") . N("  --ignorearch   - allow to install rpms for unmatched architectures.
 ") . N("  --noscripts    - do not execute package scriptlet(s)
+") . N("  --replacefiles - ignore file conflicts
 ") . N("  --repackage    - Re-package the files before erasing
 ") . N("  --skip         - packages which installation should be skipped
 ") . N("  --prefer       - packages which should be preferred
-- 
cgit v1.2.1