From 05384c1a029f516e9fb57a1f19dff05814091ebc Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Wed, 27 Oct 2004 08:23:15 +0000 Subject: Add the --strict-arch command-line option to urpmi and the strict-arch configuration file option --- urpm.pm | 1 + urpm/args.pm | 1 + urpm/cfg.pm | 1 + 3 files changed, 3 insertions(+) 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; -- cgit v1.2.1