summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/detect_devices.pm4
-rw-r--r--perl-install/harddrake/ui.pm12
2 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 5ea0e8943..6072d8d60 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -152,7 +152,7 @@ sub get_usb_storage_info {
if (@choices > 1) {
@choices = grep { $_->{info} =~ /^\Q$usbs{$host}{vendor_name}/ } @choices;
@choices or log::l("weird, can't find the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next;
- @choices == 1 or log::l("argh, can't determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next;
+ @choices == 1 or log::l("argh, can't determine the good entry host$host from /proc/scsi/usb-storage-*/* in /proc/scsi/scsi"), next
}
add2hash($choices[0], $usbs{$host});
push @informed, $choices[0];
@@ -494,7 +494,7 @@ sub stringlist {
$_->{description} eq '(null)' ? sprintf("Vendor=0x%04x Device=0x%04x", $_->{vendor}, $_->{id}) : $_->{description},
$_->{media_type} ? sprintf(" [%s]", $_->{media_type}) : '',
$_->{subid} && $_->{subid} != 0xffff ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '',
- );
+ )
} probeall(@_);
}
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 8949eab32..02109c60e 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -157,7 +157,7 @@ sub new {
unless ($::isEmbedded) {
$in = 'interactive'->vnew('su', 'default');
$wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
- my_gtk::flush;
+ my_gtk::flush();
}
%options = getVarsFromSh($conffile);
my @class_tree = &detect;
@@ -198,9 +198,9 @@ sub new {
$cmap->color_alloc($wcolor);
$tree->set_column_auto_resize(0, 1);
- $tree->signal_connect( 'select_row', sub {
- my ( $ctree, $row, $column, $event ) = @_;
- my $node = $ctree->node_nth( $row );
+ $tree->signal_connect('select_row', sub {
+ my ($ctree, $row, $column, $event) = @_;
+ my $node = $ctree->node_nth($row);
my ($name, undef) = $tree->node_get_pixtext($node,0);
my $data = $tree->{data}{$name};
@@ -247,7 +247,7 @@ sub new {
# Fill the graphic tree with a "tree branch" widget per device category
foreach (@class_tree) {
- my ($devices_list, $arg, $icon, $arg2, $title, $configurator ) = @$_;
+ my ($devices_list, $arg, $icon, $arg2, $title, $configurator) = @$_;
my $hw_class_tree = $tree->insert_node(undef, undef, @$arg, (gtkcreate_png($icon)) x 2, @$arg2);
# Fill the graphic tree with a "tree leaf" widget per device
foreach (@$devices_list) {
@@ -273,7 +273,7 @@ sub new {
sub quit_global {
- kill(15, $pid) if ($pid);
+ kill(15, $pid) if $pid;
setVarsInSh($conffile, \%options);
$w->{rwindow}->destroy;
$in->exit;