diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | pod/urpmi.8.pod | 5 | ||||
| -rw-r--r-- | urpm/args.pm | 1 | ||||
| -rw-r--r-- | urpm/install.pm | 1 | ||||
| -rwxr-xr-x | urpmi | 1 |
5 files changed, 11 insertions, 0 deletions
@@ -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}, ); } @@ -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 |