summaryrefslogtreecommitdiffstats
path: root/urpm/ldap.pm
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2007-02-21 11:12:47 +0000
committerPablo Saratxaga <pablo@mandriva.com>2007-02-21 11:12:47 +0000
commit1da4d3d0f59f23c26e24c5e282c7cb869675a6fe (patch)
tree1e649605d64152836106e23fdf0ba888b936cfa5 /urpm/ldap.pm
parent5593db89b498f57ecef817e5eeb66e002a7d6aba (diff)
downloadurpmi-1da4d3d0f59f23c26e24c5e282c7cb869675a6fe.tar
urpmi-1da4d3d0f59f23c26e24c5e282c7cb869675a6fe.tar.gz
urpmi-1da4d3d0f59f23c26e24c5e282c7cb869675a6fe.tar.bz2
urpmi-1da4d3d0f59f23c26e24c5e282c7cb869675a6fe.tar.xz
urpmi-1da4d3d0f59f23c26e24c5e282c7cb869675a6fe.zip
fixed some ngettext use
Diffstat (limited to 'urpm/ldap.pm')
-rw-r--r--urpm/ldap.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/urpm/ldap.pm b/urpm/ldap.pm
index 66fcc8db..5489948a 100644
--- a/urpm/ldap.pm
+++ b/urpm/ldap.pm
@@ -144,6 +144,7 @@ my %ldap_changed_attributes = (
'with-hdlist' => 'with_hdlist',
'http-proxy' => 'http_proxy',
'ftp-proxy' => 'ftp_proxy',
+ 'media-info-dir' => 'media_info_dir',
);
sub load_ldap_media {
@@ -166,13 +167,12 @@ sub load_ldap_media {
$config->{host} . ($config->{port} ? ":" . $config->{port} : "") . "/";
}
- my $priority = 100; #- too add ldap media at the end
eval {
my $ldap = Net::LDAP->new($config->{uri})
- or die N("Cannot connect to ldap uri :"), $config->{uri};
+ or die N("Cannot connect to ldap uri:"), $config->{uri};
$ldap->bind($config->{binddn}, $config->{password})
- or die N("Cannot connect to ldap uri :"), $config->{uri};
+ or die N("Cannot connect to ldap uri:"), $config->{uri};
#- base is mandatory
my $result = $ldap->search(
base => $config->{base},
@@ -203,7 +203,6 @@ sub load_ldap_media {
#- TODO check if name already defined ?
$medium->{name} = "ldap_" . $medium->{name};
$medium->{ldap} = 1;
- $medium->{priority} = $priority++;
next if !check_ldap_medium($medium);
urpm::media::add_existing_medium($urpm, $medium);
write_ldap_cache($urpm,$medium);