From 8acdea865038475cdb1884abe889a4175975aa2f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 1 Jul 1999 17:10:27 +0000
Subject: *** empty log message ***

---
 perl-install/detect_devices.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/detect_devices.pm')

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();
-- 
cgit v1.2.1