summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-06 14:42:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-06 14:42:37 +0000
commitd60215ea271cf171dd6292529a4c459e9148d883 (patch)
treea69cc8ab6149a70d583c354511ed749e0d83cecb /perl-install/modules.pm
parentcc85e855ad2d11bddbabc9e0a4d4e41df5ff6cc7 (diff)
downloaddrakx-d60215ea271cf171dd6292529a4c459e9148d883.tar
drakx-d60215ea271cf171dd6292529a4c459e9148d883.tar.gz
drakx-d60215ea271cf171dd6292529a4c459e9148d883.tar.bz2
drakx-d60215ea271cf171dd6292529a4c459e9148d883.tar.xz
drakx-d60215ea271cf171dd6292529a4c459e9148d883.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm9
1 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 2bcab65e6..51b51d4f7 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -572,7 +572,7 @@ sub pcmcia_need_config($) {
sub get_pcmcia_devices($$) {
my ($pcic) = @_;
- my (@devs, $module, $desc, $type, $device);
+ my (@devs, $desc);
#- try to setup pcmcia if cardmgr is not running.
if (pcmcia_need_config($pcic)) {
@@ -597,11 +597,8 @@ sub get_pcmcia_devices($$) {
foreach (cat_("/var/run/stab")) {
$desc = $1 if /^Socket\s+\d+:\s+(.*)/;
- ($type, $module, $device) = ($1, $2, $3) if /^\d+\s+(\S+)\s+(\S+)\s+\S+\s+(\S+)/;
- if ($desc && $module) {
- push @devs, { description => $desc, driver => $module, type => $type, device => $device };
- $desc = $module = undef;
- }
+ my (undef, $type, $module, undef, $device) = split;
+ push @devs, { description => $desc, driver => $module, type => $type, device => $device } if $module;
}
@devs;
}