summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-03-03 17:32:55 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-03-03 17:32:55 +0000
commite57338e203aa54d4f2dbab901783c755f97dc5c9 (patch)
tree416f19d5a21a80294abd778a5e93005127f8b075
parent2433828fdc1046ec853b633a41edc5afa03894a7 (diff)
downloadurpmi-e57338e203aa54d4f2dbab901783c755f97dc5c9.tar
urpmi-e57338e203aa54d4f2dbab901783c755f97dc5c9.tar.gz
urpmi-e57338e203aa54d4f2dbab901783c755f97dc5c9.tar.bz2
urpmi-e57338e203aa54d4f2dbab901783c755f97dc5c9.tar.xz
urpmi-e57338e203aa54d4f2dbab901783c755f97dc5c9.zip
Add --media and --searchmedia options to gurpmi
-rw-r--r--gurpmi.pm12
-rwxr-xr-xgurpmi25
2 files changed, 12 insertions, 5 deletions
diff --git a/gurpmi.pm b/gurpmi.pm
index b00bb600..0590412a 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -32,6 +32,8 @@ Usage :
Options :
--auto-select
--no-verify-rpm
+ --media media1,...
+ --searchmedia media1,...
USAGE
exit 0;
}
@@ -57,14 +59,16 @@ sub parse_command_line {
push @ARGV_expanded, $a;
}
}
+ my $nextopt;
foreach (@ARGV_expanded) {
+ if ($nextopt) { $options{$nextopt} = $_; undef $nextopt; next }
if (/^-/) {
- if ($_ eq '--no-verify-rpm') {
- $options{'no-verify-rpm'} = 1;
+ if (/^--(no-verify-rpm|auto-select)$/) {
+ $options{$1} = 1;
next;
}
- if ($_ eq '--auto-select') {
- $options{'auto-select'} = 1;
+ if (/^--(media|searchmedia)$/) {
+ $nextopt = $1;
next;
}
/^--?[hv?]/ and usage();
diff --git a/gurpmi2 b/gurpmi2
index 4177179a..c5d91a42 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -101,7 +101,10 @@ sub configure_urpm {
};
$urpm->exlock_rpm_db;
$urpm->shlock_urpmi_db;
- $urpm->configure;
+ $urpm->configure(
+ media => $gurpmi::options{media},
+ searchmedia => $gurpmi::options{searchmedia},
+ );
$urpm->{options}{'verify-rpm'} = 0 if $gurpmi::options{'no-verify-rpm'};
#- default options values
exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1 foreach qw(post-clean verify-rpm split-length);