diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2003-04-17 11:34:32 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2003-04-17 11:34:32 +0000 |
commit | 4781e491c32fdfe0dbe3cf97a8aca90040a9406b (patch) | |
tree | ca4f166763cc8be7bc01e943dcbf5a058758060d /perl-install/diskdrake | |
parent | 5458ef92ec80fab427e4d69b5cdd22bb76b261d8 (diff) | |
download | drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.gz drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.bz2 drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.tar.xz drakx-backup-do-not-use-4781e491c32fdfe0dbe3cf97a8aca90040a9406b.zip |
new perl_checker compliance
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 4 | ||||
-rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
-rw-r--r-- | perl-install/diskdrake/smbnfs_gtk.pm | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 5a3c2ea3a..2071b3e4a 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -98,7 +98,7 @@ sub main { if $::isStandalone; $in->ask_warn('', N("If you plan to use aboot, be carefull to leave a free space (2048 sectors is enough) -at the beginning of the disk")) if arch() eq 'alpha' and !$::isEmbedded; +at the beginning of the disk")) if arch() eq 'alpha' && !$::isEmbedded; $w->main; } @@ -106,7 +106,7 @@ at the beginning of the disk")) if arch() eq 'alpha' and !$::isEmbedded; sub try { my ($name, @args) = @_; my $f = $diskdrake::interactive::{$name} or die "unknown function $name"; - try_($name, \&{$f}, @args); + try_($name, \&$f, @args); } sub try_ { my ($name, $f, @args) = @_; diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 882368416..f32c872c7 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -1084,7 +1084,7 @@ sub need_migration { } sub migrate_files { - my ($in, $_hd, $part, $_all_hds) = @_; + my ($in, $_hd, $part) = @_; my $wait = $in->wait_message('', N("Moving files to the new partition")); my $handle = any::inspect($part, '', 'rw'); diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index 721a52309..51152d991 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -36,7 +36,7 @@ sub main { sub try { my ($kind, $name, @args) = @_; my $f = $diskdrake::interactive::{$name} or die "unknown function $name"; - try_($kind, $name, \&{$f}, @args); + try_($kind, $name, \&$f, @args); } sub try_ { my ($kind, $name, $f, @args) = @_; @@ -50,7 +50,7 @@ sub try_ { sub raw_hd_options { my ($in, $raw_hd) = @_; - diskdrake::interactive::Options($in, {}, $raw_hd); + diskdrake::interactive::Options($in, {}, $raw_hd, fsedit::empty_all_hds()); } sub raw_hd_mount_point { my ($in, $raw_hd) = @_; @@ -111,13 +111,13 @@ sub update { } sub find_fstab_entry { - my ($kind, $e, $add_or_not) = @_; + my ($kind, $e, $b_add_or_not) = @_; my $fs_entry = $kind->to_fstab_entry($e); if (my $fs_entry_ = find { $fs_entry->{device} eq $_->{device} } @{$kind->{val}}) { $fs_entry_; - } elsif ($add_or_not) { + } elsif ($b_add_or_not) { push @{$kind->{val}}, $fs_entry; $fs_entry; } else { |