diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 00:08:34 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 00:08:34 +0000 |
commit | 3274c8723d495a7974cb360720abc88ba5a78a67 (patch) | |
tree | 19d1c960f478857633705f21fb39cc1d06f32a2c /perl-install/diskdrake | |
parent | 26977564bb8eb4076b93e4cd25e95b44a67076ab (diff) | |
download | drakx-3274c8723d495a7974cb360720abc88ba5a78a67.tar drakx-3274c8723d495a7974cb360720abc88ba5a78a67.tar.gz drakx-3274c8723d495a7974cb360720abc88ba5a78a67.tar.bz2 drakx-3274c8723d495a7974cb360720abc88ba5a78a67.tar.xz drakx-3274c8723d495a7974cb360720abc88ba5a78a67.zip |
make new perl_checker happy (and that's not easy!)
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 6 | ||||
-rw-r--r-- | perl-install/diskdrake/interactive.pm | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 35342c6e3..ea6a47724 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -120,7 +120,7 @@ sub try_ { $update_all->(); if ($v && member($name, 'Done', 'Wizard')) { - $::isEmbedded ? kill( 'USR1', $::CCPID) : Gtk->main_quit; + $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->main_quit; } } @@ -212,7 +212,7 @@ sub current_kind_changed { my $v = $kind->{val}; my @parts = - $kind->{type} eq 'raid' ? grep {$_} @$v : + $kind->{type} eq 'raid' ? grep { $_ } @$v : $kind->{type} eq 'loopback' ? @$v : fsedit::get_fstab_and_holes($v); my $totalsectors = $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : $v->{totalsectors}; @@ -242,7 +242,7 @@ sub create_automatic_notebooks { }; $may_add->(hd2kind($_)) foreach @{$all_hds->{hds}}; $may_add->(lvm2kind($_)) foreach @{$all_hds->{lvms}}; - $may_add->(raid2kind()) if grep {$_} @{$all_hds->{raids}}; + $may_add->(raid2kind()) if grep { $_ } @{$all_hds->{raids}}; $may_add->(loopback2kind()) if @{$all_hds->{loopbacks}}; @notebook = grep_index { diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 2c9b70ca0..fe5e897c4 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -42,7 +42,7 @@ struct part { # !isFormatted && !notFormatted means we don't know which state we're in int raid # for partitions of type isRawRAID and which isPartOfRAID, the raid device number - string lvm # partition used as a PV for the VG with {lvm} as LVMname + string lvm # partition used as a PV for the VG with {lvm} as LVMname #-# loopback loopback[] # loopback living on this partition # internal @@ -725,7 +725,7 @@ sub Add2RAID { local $_ = @$raids == () ? "new" : $in->ask_from_list_('', _("Choose an existing RAID to add to"), - [ (grep {$_} map_index { $_ && "md$::i" } @$raids), __("new") ]) or return; + [ (grep { $_ } map_index { $_ && "md$::i" } @$raids), __("new") ]) or return; if (/new/) { my $nb1 = raid::new($raids, $part); @@ -834,7 +834,7 @@ sub Options { $in->ask_from(_("Mount options"), '', [ - (map {; + (map { { label => $_, text => scalar warp_text(formatAlaTeX($help{$_})), val => \$options->{$_}, advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool'), } } keys %$options), @@ -1138,7 +1138,7 @@ sub format_hd_info { $info .= _("Size: %s\n", formatXiB($hd->{totalsectors}, 512)) if $hd->{totalsectors}; $info .= _("Geometry: %s cylinders, %s heads, %s sectors\n", @{$hd->{geom}}{qw(cylinders heads sectors)}) if $::expert && $hd->{geom}; $info .= _("Info: ") . ($hd->{info} || $hd->{media_type}) . "\n" if $::expert && ($hd->{info} || $hd->{media_type}); - $info .= _("LVM-disks %s\n", join ", ", map {$_->{device}} @{$hd->{disks}}) if isLVM($hd) && $hd->{disks}; + $info .= _("LVM-disks %s\n", join ", ", map { $_->{device} } @{$hd->{disks}}) if isLVM($hd) && $hd->{disks}; $info .= _("Partition table type: %s\n", $1) if $::expert && ref($hd) =~ /_([^_]+)$/; $info .= _("on channel %d id %d\n", $hd->{channel}, $hd->{id}) if $::expert && exists $hd->{channel}; $info; |