diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:48 +0000 |
| commit | 9186647ea5fd7505f6920c2debfd4f9e2000458f (patch) | |
| tree | 7b738a881f825c65fdbae43f45b8a9154181b73e | |
| parent | 0e8899e3f41e01d15f03727131dc71f9034eca12 (diff) | |
| download | drakx-9186647ea5fd7505f6920c2debfd4f9e2000458f.tar drakx-9186647ea5fd7505f6920c2debfd4f9e2000458f.tar.gz drakx-9186647ea5fd7505f6920c2debfd4f9e2000458f.tar.bz2 drakx-9186647ea5fd7505f6920c2debfd4f9e2000458f.tar.xz drakx-9186647ea5fd7505f6920c2debfd4f9e2000458f.zip | |
help perl_checker
| -rw-r--r-- | perl-install/diskdrake/resize_ntfs.pm | 4 | ||||
| -rw-r--r-- | perl-install/fs/partitioning_wizard.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules/modprobe_conf.pm | 1 | ||||
| -rw-r--r-- | perl-install/modules/modules_conf.pm | 1 | ||||
| -rw-r--r-- | perl-install/security/level.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 3 | ||||
| -rw-r--r-- | perl-install/wizards.pm | 3 |
8 files changed, 13 insertions, 6 deletions
diff --git a/perl-install/diskdrake/resize_ntfs.pm b/perl-install/diskdrake/resize_ntfs.pm index 1b24a9707..16c2f9459 100644 --- a/perl-install/diskdrake/resize_ntfs.pm +++ b/perl-install/diskdrake/resize_ntfs.pm @@ -5,7 +5,7 @@ use strict; use run_program; use common; - +# perl_checker: require interactive sub new { my ($type, $_device, $dev) = @_; @@ -13,7 +13,7 @@ sub new { } sub check_prog { - my ($in) = @_; + my ($in) = @_; # perl_checker: $in = interactive->new #- ensure_binary_is_installed checks binary chrooted, whereas we run the binary non-chrooted (pb for Mageia One) $::isInstall || whereis_binary('ntfsresize') || $in->do_pkgs->ensure_binary_is_installed('ntfsprogs', 'ntfsresize'); } diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm index a275d2774..2cf03e86a 100644 --- a/perl-install/fs/partitioning_wizard.pm +++ b/perl-install/fs/partitioning_wizard.pm @@ -13,6 +13,8 @@ use partition_table; use partition_table::raw; use partition_table::dos; use POSIX qw(ceil); +use mygtk2; +use ugtk2 qw(:wrappers); #- unit of $mb is mega bytes, min and max are in sectors, this #- function is used to convert back to sectors count the size of diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm index 7c80ee687..c9ad3ff5c 100644 --- a/perl-install/modules/modprobe_conf.pm +++ b/perl-install/modules/modprobe_conf.pm @@ -2,6 +2,7 @@ package modules::modprobe_conf; # $Id: modprobe_conf.pm 259199 2009-08-13 10:18: use log; use common; +# perl_checker: require modules::any_conf our @ISA = qw(modules::any_conf); diff --git a/perl-install/modules/modules_conf.pm b/perl-install/modules/modules_conf.pm index b75c4e026..5a6242ff5 100644 --- a/perl-install/modules/modules_conf.pm +++ b/perl-install/modules/modules_conf.pm @@ -2,6 +2,7 @@ package modules::modules_conf; # $Id: modules_conf.pm 228209 2007-09-16 23:09:00 use log; use common; +# perl_checker: require modules::any_conf our @ISA = qw(modules::any_conf); diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm index b12caf19e..9b91067ff 100644 --- a/perl-install/security/level.pm +++ b/perl-install/security/level.pm @@ -3,7 +3,7 @@ package security::level; use strict; use common; use run_program; - +# perl_checker: require interactive sub level_list() { ( @@ -46,7 +46,7 @@ sub set { } sub level_choose { - my ($in, $security, $email) = @_; + my ($in, $security, $email) = @_; # perl_checker: $in = interactive->new my %help = ( 0 => N("This level is to be used with care, as it disables all additional security diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 9264436ad..a57c42a63 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -245,6 +245,7 @@ sub encrypt_home { run_program::rooted($::prefix, 'umount', $home); run_program::rooted($::prefix, 'cryptsetup', 'luksClose', $user->{name}); + undef $wait; } sub call { diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index da7376813..112953b27 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -322,6 +322,7 @@ sub tryConfScanner { modules::append_to_modules_loaded_at_startup_for_all_kernels($m); } } + undef $wait; } if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/ || !$port) { $port ||= N("Auto-detect available ports"); @@ -505,7 +506,7 @@ sub mainwindow { $in->wait_message(N("Please wait"), N("Searching for new scanners...")); my @f = scanner::detect(@configured); - $wait = undef; + undef $wait; if (@f) { $changed = auto(); } diff --git a/perl-install/wizards.pm b/perl-install/wizards.pm index b0f03e340..116df8be2 100644 --- a/perl-install/wizards.pm +++ b/perl-install/wizards.pm @@ -4,6 +4,7 @@ package wizards; use strict; use c; use common; +# perl_checker: require interactive =head1 NAME @@ -89,7 +90,7 @@ sub new { sub check_rpm { - my ($in, $rpms) = @_; + my ($in, $rpms) = @_; # perl_checker: $in = interactive->new foreach my $rpm (@$rpms) { next if $in->do_pkgs->is_installed($rpm); if ($in->ask_okcancel(N("Error"), N("%s is not installed\nClick \"Next\" to install or \"Cancel\" to quit", $rpm))) { |