summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-27 08:23:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-27 08:23:15 +0000
commit05384c1a029f516e9fb57a1f19dff05814091ebc (patch)
treed00c371816140a039391eb628bb4e0995030251e
parent92336daa0e10734d8025e0a874c8e2279b9940a2 (diff)
downloadurpmi-05384c1a029f516e9fb57a1f19dff05814091ebc.tar
urpmi-05384c1a029f516e9fb57a1f19dff05814091ebc.tar.gz
urpmi-05384c1a029f516e9fb57a1f19dff05814091ebc.tar.bz2
urpmi-05384c1a029f516e9fb57a1f19dff05814091ebc.tar.xz
urpmi-05384c1a029f516e9fb57a1f19dff05814091ebc.zip
Add the --strict-arch command-line option to urpmi and the strict-arch configuration file option
-rw-r--r--urpm.pm1
-rw-r--r--urpm/args.pm1
-rw-r--r--urpm/cfg.pm1
3 files changed, 3 insertions, 0 deletions
diff --git a/urpm.pm b/urpm.pm
index 4b2a0d4c..4b4b91ab 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -150,6 +150,7 @@ sub read_config {
split-level
verify-rpm
norebuild
+ strict-arch
)) {
if (defined $config->{''}{$opt} && !exists $urpm->{options}{$opt}) {
$urpm->{options}{$opt} = $config->{''}{$opt};
diff --git a/urpm/args.pm b/urpm/args.pm
index 523fbe78..ca447cc9 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -104,6 +104,7 @@ my %options_spec = (
$options{X} ||= $ENV{DISPLAY} && system('/usr/X11R6/bin/xtest', '') == 0
},
'verify-rpm!' => sub { $urpm->{options}{'verify-rpm'} = $_[1] },
+ 'strict-arch!' => sub { $urpm->{options}{'strict-arch'} = $_[1] },
'norebuild!' => sub { $urpm->{options}{norebuild} = $_[1] },
'test!' => \$::test,
'skip=s' => \$options{skip},
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index d6c48d6a..3271996e 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -113,6 +113,7 @@ sub load_config ($) {
|compress
|keep
|auto
+ |strict-arch
|resume)(?:\s*:\s*(.*))?$/x
) {
my $yes = $no ? 0 : 1;