diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-01-06 16:33:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-01-06 16:33:20 +0000 |
| commit | 3dfc204023a7a25db6345c11c7ff6c2c77638007 (patch) | |
| tree | f556f6daa3a2c50e7c27d266a6bce6d977053f95 | |
| parent | 5c3f880e202d0b2d4c3b03236a38c35192653f91 (diff) | |
| download | drakx-3dfc204023a7a25db6345c11c7ff6c2c77638007.tar drakx-3dfc204023a7a25db6345c11c7ff6c2c77638007.tar.gz drakx-3dfc204023a7a25db6345c11c7ff6c2c77638007.tar.bz2 drakx-3dfc204023a7a25db6345c11c7ff6c2c77638007.tar.xz drakx-3dfc204023a7a25db6345c11c7ff6c2c77638007.zip | |
perl_checker compliance
| -rw-r--r-- | perl-install/commands.pm | 5 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/partition_table/mac.pm | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm index de2f23136..88735b8ea 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -18,11 +18,6 @@ use vars qw($printable_chars *ROUTE *DF *PS); use MDK::Common::System; use common; -#-##################################################################################### -#- Globals -#-##################################################################################### -my $BUFFER_SIZE = 1024; - #-###################################################################################### #- Functions #-###################################################################################### diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 28810502b..cbffc10d9 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -131,7 +131,7 @@ sub getFile { #- to other to avoid media change... my $f2 = "$postinstall_rpms/$f"; $f2 = "/tmp/image/$rel" if !$postinstall_rpms || !-e $f2; - my $F; open $F, $f2 and $F; + my $F; open($F, $f2) && $F; } } || errorOpeningFile($f); } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index d1ae7ab65..8bb5cae52 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -752,7 +752,8 @@ sub installUpdates { $o->hasNetwork or return; - is_empty_hash_ref($u) and $o->ask_yesorno_({ messages => formatAlaTeX( + if (is_empty_hash_ref($u)) { + $o->ask_yesorno_({ messages => formatAlaTeX( N("You now have the opportunity to download updated packages. These packages have been updated after the distribution was released. They may contain security or bug fixes. @@ -761,8 +762,9 @@ To download these packages, you will need to have a working Internet connection. Do you want to install the updates ?")), - interactive_help_id => 'installUpdates', - }) || return; + interactive_help_id => 'installUpdates', + }) or return; + } #- bring all interface up for installing crypto packages. install_interactive::upNetwork($o); diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm index 26a7bc7a5..2a8fe8df5 100644 --- a/perl-install/partition_table/mac.pm +++ b/perl-install/partition_table/mac.pm @@ -11,7 +11,7 @@ use partition_table::raw; use partition_table; use c; -my %typeToDos = ( +my %_typeToDos = ( "Apple_partition_map" => 0x401, "Apple_Bootstrap" => 0x401, "Apple_Driver43" => 0x401, |