From 36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 9 Jun 2005 02:42:55 +0000
Subject: don't need prefixing with current package

---
 perl-install/Xconfig/main.pm        | 4 ++--
 perl-install/any.pm                 | 2 +-
 perl-install/install_any.pm         | 2 +-
 perl-install/keyboard.pm            | 4 ++--
 perl-install/partition_table/mac.pm | 2 +-
 perl-install/raid.pm                | 2 +-
 perl-install/services.pm            | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 724dc111f..91106b2e0 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -172,9 +172,9 @@ sub configure_everything_or_configure_chooser {
     my $rc = 'ok';
     if (is_empty_array_ref($raw_X)) {
 	$raw_X = Xconfig::default::configure($in->do_pkgs, $o_keyboard, $o_mouse);
-	$rc = Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options);
+	$rc = configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options);
     } elsif (!$auto) {
-	$rc = Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options);
+	$rc = configure_chooser($in, $raw_X, $in->do_pkgs, $options);
     }
     $rc && $raw_X, $rc;
 }
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c1db06151..508a9abd0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1083,7 +1083,7 @@ sub ask_window_manager_to_logout {
 sub ask_window_manager_to_logout_then_do {
     my ($wm, $pid, $action) = @_;
     if (fork()) {
-	any::ask_window_manager_to_logout($wm);
+	ask_window_manager_to_logout($wm);
 	return;
     }
     
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 754d43c81..0d7bda1c2 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -704,7 +704,7 @@ sub copy_rpms_on_disk {
 	if (method_allows_medium_change($method)) {
 	    my $r;
 	    if ($method =~ /-iso$/) {
-		$r = install_any::changeIso($name);
+		$r = changeIso($name);
 	    } else {
 		cat_("/proc/mounts") =~ m,(/dev/\S+)\s+(/mnt/cdrom|/tmp/image),
 		    and ($cdrom, my $mountpoint) = ($1, $2);
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 8b1cedcd4..81b3b371f 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -382,7 +382,7 @@ sub grp_toggles {
 sub group_toggle_choose {
     my ($in, $keyboard) = @_;
 
-    if (my $grp_toggles = keyboard::grp_toggles($keyboard)) {
+    if (my $grp_toggles = grp_toggles($keyboard)) {
 	my $GRP_TOGGLE = $keyboard->{GRP_TOGGLE} || 'caps_toggle';
 	$GRP_TOGGLE = $in->ask_from_listf('', N("Here you can choose the key or key combination that will 
 allow switching between the different keyboard layouts
@@ -550,7 +550,7 @@ sub xmodmap_file {
 
 sub setxkbmap {
     my ($keyboard) = @_;
-    my $xkb = keyboard::keyboard2full_xkb($keyboard) or return;
+    my $xkb = keyboard2full_xkb($keyboard) or return;
     run_program::run('setxkbmap', '-option', '') if $xkb->{XkbOptions}; #- need re-initialised other toggles are cumulated
     run_program::run('setxkbmap', $xkb->{XkbLayout}, '-model' => $xkb->{XkbModel}, '-option' => $xkb->{XkbOptions} || '', '-compat' => $xkb->{XkbCompat} || '');
 }
diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm
index fc0310b74..93b9d0934 100644
--- a/perl-install/partition_table/mac.pm
+++ b/perl-install/partition_table/mac.pm
@@ -296,7 +296,7 @@ sub write($$$;$) {
                 $_->{pFlags} = 0x33;
 		$_->{isBoot} = 1;
 		log::l("writing a bootstrap at /dev/$_->{device}");
-		$install_steps_interactive::new_bootstrap = 1 if !(defined $partition_table::mac::bootstrap_part);
+		$install_steps_interactive::new_bootstrap = 1 if !(defined $bootstrap_part);
 		$bootstrap_part = "/dev/" . $_->{device};
             } elsif (isSwap($_)) {
                 $_->{pType} = "Apple_UNIX_SVR2";
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index b2819f185..c16f82378 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -161,7 +161,7 @@ sub inactive_mds() {
 
 sub free_mds {
     my ($raids) = @_;
-    difference2([ map { "md$_" } 0 .. raid::max_nb() ], [ map { $_->{device} } @$raids ]);
+    difference2([ map { "md$_" } 0 .. max_nb() ], [ map { $_->{device} } @$raids ]);
 }
 
 sub detect_during_install {
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 35c0b88a6..77f9b2080 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -388,11 +388,11 @@ sub do_not_start_service_on_boot ($) {
 sub set_status {
     my ($service, $enable, $o_dont_apply) = @_;
     if ($enable) {
-	services::start_service_on_boot($service);
-	services::restart_or_start($service) unless $o_dont_apply;
+	start_service_on_boot($service);
+	restart_or_start($service) unless $o_dont_apply;
     } else {
-	services::do_not_start_service_on_boot($service);
-	services::stop($service) unless $o_dont_apply;
+	do_not_start_service_on_boot($service);
+	stop($service) unless $o_dont_apply;
     }
 }
 
-- 
cgit v1.2.1