summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-07 16:27:17 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-07 16:27:17 +0000
commite31dbaed8dff422481946a4b1d2cae187092b261 (patch)
tree3f113577b69caaf17e36b90d95c53c23d9169213
parent33e0d8afbee04077997433015255d2548fc3c3b1 (diff)
downloadurpmi-e31dbaed8dff422481946a4b1d2cae187092b261.tar
urpmi-e31dbaed8dff422481946a4b1d2cae187092b261.tar.gz
urpmi-e31dbaed8dff422481946a4b1d2cae187092b261.tar.bz2
urpmi-e31dbaed8dff422481946a4b1d2cae187092b261.tar.xz
urpmi-e31dbaed8dff422481946a4b1d2cae187092b261.zip
Patch by Michael Scherer to optionnally load media from LDAP (currently
inactive)
-rw-r--r--urpm.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/urpm.pm b/urpm.pm
index 6cec12f5..47ee8409 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -184,6 +184,8 @@ sub read_config {
$urpm->probe_medium($medium, %options) and push @{$urpm->{media}}, $medium;
}
+ eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm, %options) };
+
#- load default values
foreach (qw(post-clean verify-rpm)) {
exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1;
@@ -377,6 +379,7 @@ sub write_config {
'' => $urpm->{global_config},
};
foreach my $medium (@{$urpm->{media}}) {
+ next if $medium->{external};
my $medium_name = $medium->{name};
$config->{$medium_name}{url} = $medium->{clear_url};
foreach (qw(hdlist with_hdlist list removable key-ids priority priority-upgrade update ignore synthesis virtual)) {