diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-07-01 17:10:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-07-01 17:10:27 +0000 |
| commit | 8acdea865038475cdb1884abe889a4175975aa2f (patch) | |
| tree | 3afa347972cc6591a8da8eaa52ad0a87ffaf742a /perl-install/detect_devices.pm | |
| parent | 3b8e5409e6265e10709f46ac179f3ea7d014fcac (diff) | |
| download | drakx-8acdea865038475cdb1884abe889a4175975aa2f.tar drakx-8acdea865038475cdb1884abe889a4175975aa2f.tar.gz drakx-8acdea865038475cdb1884abe889a4175975aa2f.tar.bz2 drakx-8acdea865038475cdb1884abe889a4175975aa2f.tar.xz drakx-8acdea865038475cdb1884abe889a4175975aa2f.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 8f1fac97d..6cc170368 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -53,12 +53,12 @@ sub hasCompaqSmartArray() { sub getSCSI() { my @drives; my ($driveNum, $cdromNum, $tapeNum) = qw(0 0 0); - my $err = sub { chop; log::l("unexpected line in /proc/scsi/scsi: $_"); error() }; + my $err = sub { chop; die "unexpected line in /proc/scsi/scsi: $_"; }; local $_; local *F; - open F, "/proc/scsi/scsi" or return &$err(); - $_ = <F>; /^Attached devices:/ or return &$err(); + open F, "/proc/scsi/scsi" or die "failed to open /proc/scsi/scsi"; + local $_ = <F>; /^Attached devices:/ or return &$err(); while ($_ = <F>) { my ($id) = /^Host:.*?Id: (\d+)/ or return &$err(); $_ = <F>; my ($vendor, $model) = /^\s*Vendor:\s*(.*?)\s+Model:\s*(.*?)\s+Rev:/ or return &$err(); |