summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-13 04:12:17 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-08-13 04:12:17 +0000
commitd32716bbf24abee33ddf3c13e4e39a3d0d695fc6 (patch)
tree76281851ad84e6065a865043f98656ac97607c70
parent8ebb5bd002ae74da0e6d1ef1bce1f8b2294f4e2b (diff)
downloaddrakx-d32716bbf24abee33ddf3c13e4e39a3d0d695fc6.tar
drakx-d32716bbf24abee33ddf3c13e4e39a3d0d695fc6.tar.gz
drakx-d32716bbf24abee33ddf3c13e4e39a3d0d695fc6.tar.bz2
drakx-d32716bbf24abee33ddf3c13e4e39a3d0d695fc6.tar.xz
drakx-d32716bbf24abee33ddf3c13e4e39a3d0d695fc6.zip
perl_checker fix
-rw-r--r--perl-install/pkgs.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 17e2ccb8e..ca009f364 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -378,14 +378,14 @@ sub psUpdateHdlistsDeps {
}
sub psUsingHdlists {
- my ($prefix, $method, $hdlistsfile, $packages) = @_;
- my $listf = install_any::getFile($hdlistsfile || 'media/media_info/hdlists')
+ my ($prefix, $method, $o_hdlistsfile, $o_packages) = @_;
+ my $listf = install_any::getFile($o_hdlistsfile || 'media/media_info/hdlists')
or die "no hdlists found";
my $suppl_CDs = 0;
- if (!$packages) {
- $packages = new URPM;
+ if (!$o_packages) {
+ $o_packages = new URPM;
#- add additional fields used by DrakX.
- @$packages{qw(count mediums)} = (0, {});
+ @$o_packages{qw(count mediums)} = (0, {});
}
#- parse hdlists file.
@@ -401,15 +401,15 @@ sub psUsingHdlists {
#- make sure the first medium is always selected!
#- by default select all image.
- psUsingHdlist($prefix, $method, $packages, $2, $medium_name, $3, $4, !$1);
+ psUsingHdlist($prefix, $method, $o_packages, $2, $medium_name, $3, $4, !$1);
++$medium_name;
}
- log::l("psUsingHdlists read " . int(@{$packages->{depslist}}) .
- " headers on " . int(keys %{$packages->{mediums}}) . " hdlists");
+ log::l("psUsingHdlists read " . int(@{$o_packages->{depslist}}) .
+ " headers on " . int(keys %{$o_packages->{mediums}}) . " hdlists");
- return $packages, $suppl_CDs;
+ return $o_packages, $suppl_CDs;
}
sub psUsingHdlist {