diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-08-28 10:19:54 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-08-28 10:19:54 +0000 |
| commit | 2d3b13d3b7e6f08f6310467ece7d399c5858d233 (patch) | |
| tree | 61e0a5cc6284c4e8dc138385da6329f2b8e83e0f /perl-install/install_any.pm | |
| parent | 90f7bb2359c71498b66bf6eb4ed764671816ace6 (diff) | |
| download | drakx-2d3b13d3b7e6f08f6310467ece7d399c5858d233.tar drakx-2d3b13d3b7e6f08f6310467ece7d399c5858d233.tar.gz drakx-2d3b13d3b7e6f08f6310467ece7d399c5858d233.tar.bz2 drakx-2d3b13d3b7e6f08f6310467ece7d399c5858d233.tar.xz drakx-2d3b13d3b7e6f08f6310467ece7d399c5858d233.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 48b0d0863..4ec01334c 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -17,14 +17,15 @@ use log; 1; -sub fileInBase { member($_[0], qw(compss depslist hdlist)); } - -sub imageGetFile { - fileInBase($_[0]) and return "/tmp/rhimage/Mandrake/base/$_[0]"; - my $f = "/tmp/rhimage/Mandrake/RPMS/$_[0]"; - -r $f and return $f; - $f =~ s/i386/i586/; - $f; +sub relGetFile($) { + local $_ = member($_[0], qw(compss depslist hdlist)) ? "base" : "RPMS"; + $_ = "Mandrake/$_/$_[0]"; + s/i386/i586/; + $_; +} +sub getFile($) { + open getFile, "/tmp/rhimage/" . relGetFile($_[0]) or return; + \*getFile; } sub versionString { @@ -95,7 +96,7 @@ sub setPackages { $o->{packages}{$_}{base} = 1 foreach @{$o->{base}}; - pkgs::setCompssSelected($o->{compss}, $o->{packages}, $o->{installClass}); + pkgs::setCompssSelected($o->{compss}, $o->{packages}, $o->{installClass}, $o->{lang}); } sub addToBeDone(&$) { |