From 55bb63c38144ea7fe1393fbfd36742fb191734a6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 9 Jun 2005 04:41:19 +0000 Subject: don't need prefixing with current package --- perl-install/modules.pm | 4 ++-- perl-install/modules/any_conf.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'perl-install') diff --git a/perl-install/modules.pm b/perl-install/modules.pm index e0f02f927..1188f5f7d 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -149,9 +149,9 @@ sub load_parallel_zip { arch() !~ /ppc/ or return; - eval { modules::load('parport_pc') }; + eval { load('parport_pc') }; grep { - eval { modules::load_and_configure($conf, $_); 1 }; + eval { load_and_configure($conf, $_); 1 }; } 'imm', 'ppa'; } diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm index fbf488937..7c2bcc0a8 100644 --- a/perl-install/modules/any_conf.pm +++ b/perl-install/modules/any_conf.pm @@ -128,7 +128,7 @@ sub set_sound_slot { sub read { my (undef, $o_file) = @_; - my $conf = modules::any_conf::vnew(); + my $conf = vnew(); $conf->read($o_file); } @@ -183,7 +183,7 @@ sub merge_into { sub read_handled { my ($conf, $o_file) = @_; my $file = $o_file || $::prefix . $conf->file; - my $raw_conf = modules::any_conf::read_raw($file); + my $raw_conf = read_raw($file); foreach my $module (keys %$raw_conf) { my $raw = $raw_conf->{$module}; -- cgit v1.2.1