summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-18 12:15:32 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-18 12:15:32 +0000
commit13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4 (patch)
tree8e1452d0b8aeebb0eb8b1c5d18fb90600b9dbeed /perl-install
parent811c20ff5e2a0793f82e1127640574ef292de376 (diff)
downloaddrakx-13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4.tar
drakx-13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4.tar.gz
drakx-13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4.tar.bz2
drakx-13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4.tar.xz
drakx-13cf9dfbb5a8f5d89e6e84a87c9b8b1781d3ced4.zip
perl_checker cleanups
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 6005c2f94..01851ecca 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -218,7 +218,7 @@ sub getSCSI() {
}
warn("cannot get info for device ($_)"), next if !$device;
- my $usb_dir = readlink("$dir") =~ m!/usb! && "$dir/../../../..";
+ my $usb_dir = readlink($dir) =~ m!/usb! && "$dir/../../../..";
my $get_usb = sub { chomp_(cat_("$usb_dir/$_[0]")) };
my $get = sub {
@@ -238,7 +238,7 @@ sub getSCSI() {
foreach my $name (keys %hd_vendors) {
next if !$name;
($vendor, $model) = ($hd_vendors{$name}, $2) if $model =~ /^$name(-|\s)*(.*)/;
- };
+ }
push @l, { info => $vendor . ' ' . $model, host => $host, channel => $channel, id => $id, lun => $lun,
description => join('|', $vendor, $model),
bus => 'SCSI', media_type => $media_type, device => $device,
@@ -717,7 +717,7 @@ sub get_ids_from_sysfs_device {
if ($bus eq 'pci') {
my $device = basename(readlink $dev_path);
my @ids = $device =~ /^(.{4}):(.{2}):(.{2})\.(.+)$/;
- @{$sysfs_ids}{qw(pci_domain pci_bus pci_device pci_function)} = map { hex($_) } @ids if @ids;
+ @$sysfs_ids{qw(pci_domain pci_bus pci_device pci_function)} = map { hex($_) } @ids if @ids;
}
}
$sysfs_ids;