diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-08-30 22:32:42 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-08-30 22:32:42 +0000 |
| commit | 0ed259c5a608e956c9ccfac2845413a6e688d11f (patch) | |
| tree | 85db0899993a141f8ca805c4b7d82623dad65fd7 /perl-install/install_any.pm | |
| parent | 1defcba73b989b6a28826c563417a7c0fc251052 (diff) | |
| download | drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.gz drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.bz2 drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.tar.xz drakx-0ed259c5a608e956c9ccfac2845413a6e688d11f.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 70568a512..06779960b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -84,8 +84,10 @@ sub shells($) { sub setPackages { my ($o) = @_; - eval { $o->{packages} = pkgs::psUsingHdlist() } if $o->{method} ne "nfs"; - $o->{packages} = pkgs::psUsingDirectory() if $o->{method} eq "nfs" || $@; + my $useHdlist = $o->{method} !~ /nfs|hd/; + eval { $o->{packages} = pkgs::psUsingHdlist() } if $useHdlist; + $o->{packages} = pkgs::psUsingDirectory() if !$useHdlist || $@; + pkgs::getDeps($o->{packages}); $o->{compss} = pkgs::readCompss($o->{packages}); @@ -106,7 +108,7 @@ sub addToBeDone(&$) { sub getTimeZones { local *F; - open F, "cd /usr/share/zoneinfo && find [A-Z]* -type f |"; + open F, "cd $::o->{prefix}/usr/share/zoneinfo && find [A-Z]* -type f |"; my @l = sort map { chop; $_ } <F>; close F or die "cannot list the available zoneinfos"; @l; |