summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-20 10:52:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-20 10:52:43 +0000
commitdc6a8a53da7b40811154eaf96386cadfe0a5f5d8 (patch)
tree996ce11ce993ef4565ad50029b4969dbb9dd6d80
parentd76557c69f2494ced405080980590f9e05a0ff2d (diff)
downloadurpmi-dc6a8a53da7b40811154eaf96386cadfe0a5f5d8.tar
urpmi-dc6a8a53da7b40811154eaf96386cadfe0a5f5d8.tar.gz
urpmi-dc6a8a53da7b40811154eaf96386cadfe0a5f5d8.tar.bz2
urpmi-dc6a8a53da7b40811154eaf96386cadfe0a5f5d8.tar.xz
urpmi-dc6a8a53da7b40811154eaf96386cadfe0a5f5d8.zip
make it more explicit that read_config has one option (nocheck_access)
-rw-r--r--urpm.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index 7d2332d1..6f242c3b 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -233,7 +233,7 @@ sub recover_url_from_list {
#- options :
#- - nocheck_access : don't check presence of hdlist and other files
sub read_config {
- my ($urpm, %options) = @_;
+ my ($urpm, $b_nocheck_access) = @_;
return if $urpm->{media}; #- media already loaded
$urpm->{media} = [];
my $config = urpm::cfg::load_config($urpm->{config})
@@ -265,10 +265,10 @@ sub read_config {
$medium->{url} or $urpm->{error}("unable to find url in list file $medium->{name}, medium ignored");
}
- $urpm->add_existing_medium($medium, $options{nocheck_access});
+ $urpm->add_existing_medium($medium, $b_nocheck_access);
}
- eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm, %options) };
+ eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm) };
#- load default values
foreach (qw(post-clean verify-rpm)) {
@@ -625,7 +625,7 @@ sub configure {
$urpm->{media} = [];
$urpm->add_distrib_media("Virtual", $options{usedistrib}, %options, 'virtual' => 1);
} else {
- $urpm->read_config(%options);
+ $urpm->read_config($options{nocheck_access});
if (!$options{media} && $urpm->{options}{'default-media'}) {
$options{media} = $urpm->{options}{'default-media'};
}