summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgurpmi21
-rw-r--r--pod/urpmi.8.pod5
-rw-r--r--urpm/args.pm1
-rwxr-xr-xurpmi2
-rw-r--r--urpmi.bash-completion2
5 files changed, 10 insertions, 1 deletions
diff --git a/gurpmi2 b/gurpmi2
index af2f5159..dd056477 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -288,6 +288,7 @@ sub do_install_3 () {
excludedocs => $urpm->{options}{excludedocs},
repackage => $urpm->{options}{repackage},
nosize => $urpm->{options}{ignoresize},
+ ignorearch => $urpm->{options}{ignorearch},
noscripts => $urpm->{options}{noscripts},
);
if (@l) {
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index 109f9080..cf70037f 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -273,6 +273,11 @@ names begin with the given I<string> (same as C<rpm --excludepath>).
Do not install documents files (same as C<rpm --excludedocs>).
+=item B<--ignorearch>
+
+Allow to install packages whose architecture does not match the
+architecture of the host. This is equivalent to C<rpm --ignorearch>.
+
=item B<--ignoresize>
Don't check file systems for sufficient disk space before installation.
diff --git a/urpm/args.pm b/urpm/args.pm
index 4bc5b425..b586cacd 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -129,6 +129,7 @@ my %options_spec = (
'excludepath|exclude-path=s' => sub { $urpm->{options}{excludepath} = $_[1] },
'excludedocs|exclude-docs' => sub { $urpm->{options}{excludedocs} = 1 },
'ignoresize' => sub { $urpm->{options}{ignoresize} = 1 },
+ 'ignorearch' => sub { $urpm->{options}{ignorearch} = 1 },
noscripts => sub { $urpm->{options}{noscripts} = 1 },
repackage => sub { $urpm->{options}{repackage} = 1 },
'more-choices' => sub { $urpm->{options}{morechoices} = 1 },
diff --git a/urpmi b/urpmi
index 9e9560dc..3871fab9 100755
--- a/urpmi
+++ b/urpmi
@@ -129,6 +129,7 @@ usage:
") . N(" --excludepath - exclude path separated by comma.
") . N(" --excludedocs - exclude doc files.
") . 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(" --repackage - Re-package the files before erasing
") . N(" --skip - packages which installation should be skipped
@@ -702,6 +703,7 @@ foreach my $set (@{$state->{transaction} || []}) {
translate_message => 1,
oldpackage => $state->{oldpackage},
nosize => $urpm->{options}{ignoresize},
+ ignorearch => $urpm->{options}{ignorearch},
noscripts => $urpm->{options}{noscripts},
);
my @l = $urpm->install(
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index d2a0cab6..11a03dc5 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -92,7 +92,7 @@ _urpmi()
--wget --curl --limit-rate --proxy --proxy-user --bug \
--env --verify-rpm --no-verify-rpm --no-install \
--test --excludepath --excludedocs --root --norebuild \
- --searchmedia --noscripts --ignoresize' -- $cur ) )
+ --searchmedia --noscripts --ignoresize --ignorearch' -- $cur ) )
else
# return available packages (unless it is clearly a file) and rpm files
if [[ "$cur" != */* ]]; then