diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-09 04:41:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-09 04:41:19 +0000 |
| commit | 55bb63c38144ea7fe1393fbfd36742fb191734a6 (patch) | |
| tree | 774999b6fdd05036b154da1f26c9d7accdf19bdc | |
| parent | 36c5e47487a2682e9f948c2ea31f0c4ca43b9c4f (diff) | |
| download | drakx-55bb63c38144ea7fe1393fbfd36742fb191734a6.tar drakx-55bb63c38144ea7fe1393fbfd36742fb191734a6.tar.gz drakx-55bb63c38144ea7fe1393fbfd36742fb191734a6.tar.bz2 drakx-55bb63c38144ea7fe1393fbfd36742fb191734a6.tar.xz drakx-55bb63c38144ea7fe1393fbfd36742fb191734a6.zip | |
don't need prefixing with current package
| -rw-r--r-- | perl-install/modules.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules/any_conf.pm | 4 |
2 files changed, 4 insertions, 4 deletions
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}; |