summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/diskdrake/interactive.pm6
-rw-r--r--perl-install/install_steps_auto_install.pm2
-rw-r--r--perl-install/install_steps_interactive.pm10
-rw-r--r--perl-install/partition_table/gpt.pm4
-rw-r--r--perl-install/partition_table/mac.pm10
-rw-r--r--perl-install/partition_table/raw.pm2
-rwxr-xr-xperl-install/standalone/harddrake216
8 files changed, 26 insertions, 26 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index d674d1e35..a4ce1be77 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -326,7 +326,7 @@ sub current_part() {
sub kind2hd {
my ($kind) = @_;
- $kind->{type} =~ /hd|lvm/ ? $kind->{val} : {}
+ $kind->{type} =~ /hd|lvm/ ? $kind->{val} : {};
}
sub hd2kind {
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index cbf1370ec..3cc33dd90 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -320,7 +320,7 @@ sub Clear_all {
RemoveFromRAID($in, $hd, $_, $all_hds) if isPartOfRAID($_);
}
if (isLVM($hd)) {
- lvm::lv_delete($hd, $_) foreach @parts
+ lvm::lv_delete($hd, $_) foreach @parts;
} else {
$hd->{readonly} = 0; #- give a way out of readonly-ness. only allowed when getting_rid_of_readonly_allowed
$hd->{getting_rid_of_readonly_allowed} = 0;
@@ -923,7 +923,7 @@ sub Options {
[
(map {
{ label => $_, text => scalar warp_text(formatAlaTeX($help{$_})), val => \$options->{$_}, hidden => scalar(/password/),
- advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool'), }
+ advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool') };
} keys %$options),
{ label => N("Various"), val => \$unknown, advanced => 1 },
],
@@ -1263,7 +1263,7 @@ sub choose_encrypt_key {
complete => sub {
length $encrypt_key < 6 and $in->ask_warn('', N("This encryption key is too simple (must be at least %d characters long)", 6)), return 1,0;
$encrypt_key eq $encrypt_key2 or $in->ask_warn('', [ N("The encryption keys do not match"), N("Please try again") ]), return 1,1;
- return 0
+ return 0;
} } }, [
{ label => N("Encryption key"), val => \$encrypt_key, hidden => 1 },
{ label => N("Encryption key (again)"), val => \$encrypt_key2, hidden => 1 },
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 4f90d7c69..0933518cf 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -116,7 +116,7 @@ sub errorInStep {
#-######################################################################################
sub installPackages {
my ($o, $packages) = @_;
- catch_cdie { $o->install_steps::installPackages($packages) } sub { print formatError($@), "\n"; 1 }
+ catch_cdie { $o->install_steps::installPackages($packages) } sub { print formatError($@), "\n"; 1 };
}
1;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ac959d875..10f8695a8 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -96,7 +96,7 @@ sub acceptLicense {
if ($::globetrotter) {
system("killall XFree86");
exec("/sbin/reboot");
- };
+ }
install_any::ejectCdrom();
$o->exit;
};
@@ -334,7 +334,7 @@ sub choosePartitionsToFormat {
my @l = grep { !$_->{isMounted} && $_->{mntpoint} &&
(!isSwap($_) || $::expert) &&
(!isFat_or_NTFS($_) || $_->{notFormatted} || $::expert) &&
- (!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
+ (!isOtherAvailableFS($_) || $::expert || $_->{toFormat});
} @$fstab;
$_->{toFormat} = 1 foreach grep { isSwap($_) && !$::expert } @$fstab;
@@ -653,7 +653,7 @@ sub reallyChooseGroups {
disabled => sub { $all },
text => translate($_->{label}),
help => translate($_->{descr}),
- }
+ };
} @$compssUsers),
if_($o->{meta_class} eq 'desktop', { text => N("All"), val => \$all, type => 'bool' }),
if_($individual, { text => N("Individual package selection"), val => $individual, advanced => 1, type => 'bool' }),
@@ -1137,7 +1137,7 @@ sub summary {
label => N("Bootloader"),
val => sub {
#-PO: example: lilo-graphic on /dev/hda1
- N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot})
+ N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot});
},
clicked => sub {
any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security});
@@ -1228,7 +1228,7 @@ sub setRootPassword {
$sup->{password} eq $sup->{password2} or $o->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1,0;
length $sup->{password} < 2 * $o->{security}
and $o->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return 1,0;
- return 0
+ return 0;
} } }, [
{ label => N("Password"), val => \$sup->{password}, hidden => 1 },
{ label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 },
diff --git a/perl-install/partition_table/gpt.pm b/perl-install/partition_table/gpt.pm
index 423d73a7a..3e0ac631b 100644
--- a/perl-install/partition_table/gpt.pm
+++ b/perl-install/partition_table/gpt.pm
@@ -112,7 +112,7 @@ sub read_header {
$info{revision} <= $current_revision or log::l("oops, this is a new GPT revision ($info{revision} > $current_revision)");
$info{headerCRC32} == compute_headerCRC32(\%info) or die "bad partition table checksum";
- \%info
+ \%info;
}
sub read_partitionEntries {
@@ -169,7 +169,7 @@ sub write {
$_->{gpt_type} = $gpt_types{$_->{pt_type}} || $_->{gpt_type} || $gpt_types{0x83};
}
my $partitionEntries = join('', map {
- pack($partitionEntry_format, @$_{@$partitionEntry_fields})
+ pack($partitionEntry_format, @$_{@$partitionEntry_fields});
} (@$pt, ({}) x ($info->{nbPartitions} - @$pt)));
$info->{partitionEntriesCRC32} = crc32($partitionEntries);
diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm
index 4b60710bb..1c792519a 100644
--- a/perl-install/partition_table/mac.pm
+++ b/perl-install/partition_table/mac.pm
@@ -175,7 +175,7 @@ sub read($$) {
} else {
$h{pt_type} = 0x401;
$h{isDriver} = 1;
- };
+ }
# Let's see if this partition is a driver.
foreach (@{$info{ddMap}}) {
@@ -185,7 +185,7 @@ sub read($$) {
}
\%h;
} [ $part ];
- };
+ }
[ @pt ], \%info;
}
@@ -225,7 +225,7 @@ sub write($$$;$) {
};
}
push @partstowrite, $part;
- };
+ }
# now, fill a gap at the end if there is one.
if ($last->{start} + $last->{size} < $hd->{totalsectors}) {
@@ -327,7 +327,7 @@ sub write($$$;$) {
$_->{pName} = "Extra";
$_->{pFlags} = 0x31;
}
- };
+ }
$_->{pMapEntry} = @partstowrite;
syswrite $F, pack($p_format, @$_{@$p_fields}), psizeof($p_format) or return 0;
}
@@ -384,7 +384,7 @@ sub clear_raw {
push @{$pt->{normal}}, $pt->{raw}[$i];
$i++;
}
- };
+ }
@{$pt->{info}{ddMap}} = @{$hd->{primary}{info}{ddMap}};
$pt;
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index 01193b190..53d16024d 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -160,7 +160,7 @@ sub get_geometry {
if ($total = c::total_sectors(fileno $F)) {
compute_nb_cylinders(\%geom, $total);
} else {
- $total = $geom{heads} * $geom{sectors} * $geom{cylinders}
+ $total = $geom{heads} * $geom{sectors} * $geom{cylinders};
}
{ geom => \%geom, totalsectors => $total };
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 4e26beed9..9714db57f 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -197,12 +197,12 @@ my @menu_items =
N("Description of the fields:\n\n")
. join("\n\n", map {
my $info = lookup_field($_);
- if_($info->[0], formatAlaTeX(qq(<span foreground="royalblue3">$info->[0]:</span> $info->[1])))
+ if_($info->[0], formatAlaTeX(qq(<span foreground="royalblue3">$info->[0]:</span> $info->[1])));
} sort keys %$current_device),
- { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}), height => 400, scroll => 1 })
+ { use_markup => 1, if_(!$::isEmbedded, transient => $w->{window}), height => 400, scroll => 1 });
} else {
- create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{window}) })
+ create_dialog(N("Select a device!"), N("Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"), { if_(!$::isEmbedded, transient => $w->{window}) });
}
},
undef, '<Item>'
@@ -313,7 +313,7 @@ $tree->get_selection->signal_connect('changed' => sub {
$current_device->{$_} eq 'yes' ? N("Yes") :
$current_device->{$_} eq 'no' ? N("No") :
$current_device->{$_}) . "\n\n", if_($_ eq 'driver' && $current_device->{$_} =~ /^unknown|^Bad:/, { foreground => 'indian red' }) ]
- ])
+ ]);
} sort keys %$current_device;
my %groups = map { if_(ref $groups{$_}, %{$groups{$_}}) } 'generic', $current_class;
my ($grouped, $ungrouped) = partition {
@@ -328,13 +328,13 @@ $tree->get_selection->signal_connect('changed' => sub {
push @formated, titleFormat($group);
push @formated, map { if_(ref $_, @$_) } @device_fields{@fields};
- };
+ }
push @formated, if_(@formated && @$ungrouped, titleFormat(N("Misc"))), map { @{$device_fields{$_}} } @$ungrouped;
gtktext_insert($text, \@formated);
foreach (keys %$current_device) {
print qq(Warning: skip "$_" field => "$current_device->{$_}"\n\n) unless (lookup_field($_))[0];
- };
+ }
# if we've valid driver, let's offer to configure it, else hide buttons
show_hide(defined($current_device->{driver}) && $current_device->{driver} !~ /^unknown|^Bad|^Card|^Hsf|^Removable:|\|/, $module_cfg_button);
@@ -434,7 +434,7 @@ foreach (@classes) {
rename_field($_, 'usb_vendor', 'vendor');
rename_field($_, 'vendor_name', 'Vendor');
- foreach my $i (qw(auxmouse devfs_prefix unsafe val wacom)) { delete $_->{$i} };
+ foreach my $i (qw(auxmouse devfs_prefix unsafe val wacom)) { delete $_->{$i} }
my $custom_id = harddrake::data::custom_id($_, $title);
foreach my $field (qw(devfs_device device)) {
@@ -525,5 +525,5 @@ sub popup_menu {
}
# Tell calling code that we have not handled this event; pass it on.
return 0;
- }
+ };
}