summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-10-17 18:34:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-10-17 18:34:49 +0000
commitacdc26142db3112becc42fe2e5c67147ed8a9fa7 (patch)
treeeb30f32b12e11786e3a8c6d94db4dc92b42344d3
parent369fb96d664c7f80217611e52458cdfffc89af72 (diff)
downloaddrakx-acdc26142db3112becc42fe2e5c67147ed8a9fa7.tar
drakx-acdc26142db3112becc42fe2e5c67147ed8a9fa7.tar.gz
drakx-acdc26142db3112becc42fe2e5c67147ed8a9fa7.tar.bz2
drakx-acdc26142db3112becc42fe2e5c67147ed8a9fa7.tar.xz
drakx-acdc26142db3112becc42fe2e5c67147ed8a9fa7.zip
make new perl_checker happy: replacing PKG::f by PKG::f()
-rw-r--r--perl-install/Xconfig/monitor.pm2
-rw-r--r--perl-install/Xconfig/resolution_and_depth.pm2
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/install_steps_interactive.pm6
-rw-r--r--perl-install/interactive/gtk.pm2
-rw-r--r--perl-install/interactive/newt.pm26
-rw-r--r--perl-install/network/modem.pm2
-rw-r--r--perl-install/pkgs.pm2
9 files changed, 24 insertions, 24 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 9b3eea507..6efc9b600 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -11,7 +11,7 @@ use log;
sub good_default_monitor {
arch() =~ /ppc/ ?
- (detect_devices::get_mac_model =~ /^iBook/ ? 'Apple|iBook 800x600' : 'Apple|iMac/PowerBook 1024x768') :
+ (detect_devices::get_mac_model() =~ /^iBook/ ? 'Apple|iBook 800x600' : 'Apple|iMac/PowerBook 1024x768') :
(detect_devices::isLaptop() ? 'Generic|Flat Panel 1024x768' : 'Generic|1024x768 @ 70 Hz');
}
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 376e60aa1..f946d19dd 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -48,7 +48,7 @@ sub size2default_resolution {
my ($size) = @_; #- size in inch
if (arch() =~ /ppc/) {
- return "1024x768" if detect_devices::get_mac_model =~ /^PowerBook|^iMac/;
+ return "1024x768" if detect_devices::get_mac_model() =~ /^PowerBook|^iMac/;
}
my %monitorSize2resolution = (
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e25d047d9..de2f7ac93 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -173,7 +173,7 @@ sub setupBootloader {
),
{ label => _("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
{ label => _("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1 },
- if_(detect_devices::isLaptop,
+ if_(detect_devices::isLaptop(),
{ label => _("Enable multi profiles"), val => \$profiles, type => 'bool', advanced => 1 },
),
],
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6c5a59b8b..86e645d40 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -161,7 +161,7 @@ sub doPartitionDisksAfter {
$o->{fstab} = [ fsedit::get_all_fstab($o->{all_hds}) ];
fsedit::get_root_($o->{fstab}) or die "Oops, no root partition";
- if (arch() =~ /ppc/ && detect_devices::get_mac_generation =~ /NewWorld/) {
+ if (arch() =~ /ppc/ && detect_devices::get_mac_generation() =~ /NewWorld/) {
die "Need bootstrap partition to boot system!" if !(defined $partition_table::mac::bootstrap_part);
}
@@ -1003,7 +1003,7 @@ Beware that some Mandrake tools rely on the contents of some
of these files... so remove any file from here at your own
risk!
" };
- install_any::unlockCdrom;
+ install_any::unlockCdrom();
install_any::log_sizes($o);
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 21e9c68ed..26585229a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -280,7 +280,7 @@ sub selectMouse {
my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name};
$o->{mouse} = mouse::fullname2mouse(
$o->ask_from_treelist_('', _("Please choose the type of your mouse."),
- '|', [ mouse::fullnames ], $prev) || return) if $force;
+ '|', [ mouse::fullnames() ], $prev) || return) if $force;
if ($force && $o->{mouse}{type} eq 'serial') {
$o->set_help('selectSerialPort');
@@ -288,7 +288,7 @@ sub selectMouse {
$o->ask_from_listf(_("Mouse Port"),
_("Please choose on which serial port your mouse is connected to."),
\&mouse::serial_port2text,
- [ mouse::serial_ports ]) or return;
+ [ mouse::serial_ports() ]) or return;
}
if (arch() =~ /ppc/ && $o->{mouse}{nbuttons} == 1) {
#- set a sane default F11/F12
@@ -369,7 +369,7 @@ sub doPartitionDisks {
install_any::getHds($o, $o);
- if (arch() =~ /ppc/ && detect_devices::get_mac_generation =~ /NewWorld/) { #- need to make bootstrap part if NewWorld machine - thx Pixel ;^)
+ if (arch() =~ /ppc/ && detect_devices::get_mac_generation() =~ /NewWorld/) { #- need to make bootstrap part if NewWorld machine - thx Pixel ;^)
if (defined $partition_table::mac::bootstrap_part) {
#- don't do anything if we've got the bootstrap setup
#- otherwise, go ahead and create one somewhere in the drive free space
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 3fb7fd02a..32e42b496 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -19,7 +19,7 @@ sub new {
sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) }
sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) }
-sub exit { my_gtk::exit @_ }
+sub exit { my_gtk::exit(@_) }
sub ask_warn {
local $my_gtk::pop_it = 1;
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 91372df37..9493910e9 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -15,19 +15,19 @@ my ($width, $height) = (80, 25);
my @wait_messages;
sub new() {
- Newt::Init;
- Newt::Cls;
- Newt::SetSuspendCallback;
- ($width, $height) = Newt::GetScreenSize;
+ Newt::Init();
+ Newt::Cls();
+ Newt::SetSuspendCallback();
+ ($width, $height) = Newt::GetScreenSize();
open STDERR,">/dev/null" if $::isStandalone && !$::testing;
bless {}, $_[0];
}
-sub enter_console { Newt::Suspend }
-sub leave_console { Newt::Resume }
-sub suspend { Newt::Suspend }
-sub resume { Newt::Resume }
-sub end() { Newt::Finished }
+sub enter_console { Newt::Suspend() }
+sub leave_console { Newt::Resume() }
+sub suspend { Newt::Suspend() }
+sub resume { Newt::Resume() }
+sub end() { Newt::Finished() }
sub exit() { end; exit($_[1]) }
END { end() }
@@ -231,13 +231,13 @@ sub ask_fromW_real {
$button->{e}{clicked_may_quit}();
};
$form->FormDestroy;
- Newt::PopWindow;
+ Newt::PopWindow();
return $v || &ask_fromW;
}
} until ($check->($common->{callbacks}{$canceled ? 'canceled' : 'complete'}));
$form->FormDestroy;
- Newt::PopWindow;
+ Newt::PopWindow();
!$canceled;
}
@@ -249,7 +249,7 @@ sub waitbox {
Newt::CenteredWindow($w, $h, $title);
$f->FormAddComponent($t);
$f->DrawForm;
- Newt::Refresh;
+ Newt::Refresh();
$f->FormDestroy;
push @wait_messages, $f;
$f;
@@ -270,7 +270,7 @@ sub wait_message_endW {
my ($o, $w) = @_;
my $wait = pop @wait_messages;
# log::l("interactive_newt does not handle none stacked wait-messages") if $w->{form} != $wait;
- Newt::PopWindow;
+ Newt::PopWindow();
}
sub simplify_string {
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index b075453ba..8d699707a 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -38,7 +38,7 @@ sub pppConfig {
$::isInstall and $in->set_help('selectSerialPort');
$modem->{device} ||= $in->ask_from_listf('', _("Please choose which serial port your modem is connected to."),
\&mouse::serial_port2text,
- [ grep { $_ ne $mouse->{device} } (mouse::serial_ports, if_(-e '/dev/modem', '/dev/modem')) ]) || return;
+ [ grep { $_ ne $mouse->{device} } (mouse::serial_ports(), if_(-e '/dev/modem', '/dev/modem')) ]) || return;
$::isStandalone || $in->set_help('configureNetworkISP');
$in->ask_from('', _("Dialup options"), [
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index e15b727bd..a7784ce85 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -915,7 +915,7 @@ sub install($$$;$$) {
log::l("pkgs::install the following: ", join(" ", map { $_->name } values %packages));
eval { fs::mount("/proc", "$prefix/proc", "proc", 0) } unless -e "$prefix/proc/cpuinfo";
- URPM::read_config_files;
+ URPM::read_config_files();
openInstallLog($prefix);
#- do not modify/translate the message used with installCallback since