- urpmi, gurpmi:

  o handle (poorly) --replacefiles (will be used by mdkonline)

(backported from trunk, except we don't want to require a new perl-URPM, so we
pass "force" instead of "replacefiles" to rpmlib)

4 files changed, 10 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index b5f20c53..ca33357f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-- library:
-  o pass "replacefiles" to rpmlib (will be used by mdkonline)
+- urpmi, gurpmi:
+  o handle (poorly) --replacefiles (will be used by mdkonline)
 - 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..3f07fa16 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 --replacefiles>.
+
 =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..2e590b23 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,
@@ -409,7 +410,7 @@ sub add_urpmf_parameter {
 
 # common options setup
 
-foreach my $k ('allow-medium-change', 'auto', 'auto-select', 'force', 'expect-install!', 'justdb', 'no-priority-upgrade', 'noscripts', 'p', 'P', 'previous-priority-upgrade=s', 'root=s', 'test!', 'verify-rpm!', 'update')
+foreach my $k ('allow-medium-change', 'auto', 'auto-select', 'force', 'expect-install!', 'justdb', 'no-priority-upgrade', 'noscripts', 'replacefiles', 'p', 'P', 'previous-priority-upgrade=s', 'root=s', 'test!', 'verify-rpm!', 'update')
 {
     $options_spec{gurpmi}{$k} = $options_spec{urpmi}{$k};
 }
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