summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:58:00 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-03-08 08:58:00 +0000
commit7410fe3578d48fced30194d17af2642057c03b09 (patch)
tree199f51aa9e6d532be34d6f3a849814e23f6e94b5
parent4fcf385fb0fbafe600047720d897264ca3c1be93 (diff)
downloaddrakx-7410fe3578d48fced30194d17af2642057c03b09.tar
drakx-7410fe3578d48fced30194d17af2642057c03b09.tar.gz
drakx-7410fe3578d48fced30194d17af2642057c03b09.tar.bz2
drakx-7410fe3578d48fced30194d17af2642057c03b09.tar.xz
drakx-7410fe3578d48fced30194d17af2642057c03b09.zip
(get_info_providers_backend) drop file argument and do ISDN db lookup in place
-rw-r--r--perl-install/network/isdn.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 87480d74a..19fc9f2e1 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -16,7 +16,6 @@ use MDK::Common::File;
@ISA = qw(Exporter);
@EXPORT = qw(isdn_write_config isdn_write_config_backend get_info_providers_backend isdn_ask_info isdn_ask_protocol isdn_ask isdn_detect_backend isdn_get_list isdn_get_info read_providers_backend);
-sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompressed($file) }
sub isdn_write_config {
my ($isdn, $netc) = @_;
@@ -107,8 +106,11 @@ sub isdn_read_config {
$isdn;
}
+my $file = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db";
+$file = "$::prefix$file" if !-e $file;
+
sub get_info_providers_backend {
- my ($isdn, $_netc, $name, $file) = @_;
+ my ($isdn, $_netc, $name) = @_;
$name eq 'Unlisted - edit manually' and return;
foreach (catMaybeCompressed($file)) {
chop;
@@ -120,6 +122,8 @@ sub get_info_providers_backend {
}
}
+sub read_providers_backend { map { /(.*?)=>/ } catMaybeCompressed($file) }
+
sub isdn_ask_info {
my ($isdn, $netc) = @_;
my $f = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db";