From dc6a8a53da7b40811154eaf96386cadfe0a5f5d8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 20 Nov 2006 10:52:43 +0000
Subject: make it more explicit that read_config has one option
 (nocheck_access)

---
 urpm.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'urpm.pm')

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'};
 	    }
-- 
cgit v1.2.1