summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-20 12:12:53 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-20 12:12:53 +0000
commit06ef0920b41b391d4d3953b03c4fd266872dcd82 (patch)
tree771bf7ea904b00e2a7c9d68c372297f7cbcf02e9
parent635c590d21ca7bf878aa1d3a60bce36020e79f94 (diff)
downloaddrakx-06ef0920b41b391d4d3953b03c4fd266872dcd82.tar
drakx-06ef0920b41b391d4d3953b03c4fd266872dcd82.tar.gz
drakx-06ef0920b41b391d4d3953b03c4fd266872dcd82.tar.bz2
drakx-06ef0920b41b391d4d3953b03c4fd266872dcd82.tar.xz
drakx-06ef0920b41b391d4d3953b03c4fd266872dcd82.zip
*** empty log message ***
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/pkgs.pm6
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2799ff252..a721ae99a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -251,7 +251,7 @@ sub setPackages($) {
push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners();
push @{$o->{default_packages}}, "alsa" if modules::get_alias("sound") =~ /^snd-card-/;
- pkgs::getDeps($o->{packages});
+ pkgs::getDeps($o->{prefix}, $o->{packages});
$o->{compss} = pkgs::readCompss($o->{packages});
$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
@@ -591,8 +591,6 @@ sub fsck_option() {
sub install_urpmi {
my ($prefix, $method, $mediums) = @_;
- getAndSaveFile("depslist", "$prefix/var/lib/urpmi/depslist");
-
my @cfg = map_index {
my $name = $_->{fakemedium};
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 021bc9c6b..4a7d6d3f9 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -441,7 +441,11 @@ sub getOtherDeps($$) {
}
sub getDeps($) {
- my ($packages) = @_;
+ my ($prefix, $packages) = @_;
+
+ #- this is necessary for urpmi, but also as hdlist are copied here,
+ #- we can make consistent the directory.
+ install_any::getAndSaveFile("depslist", "$prefix/var/lib/urpmi/depslist");
my $f = install_any::getFile("depslist.ordered") or die "can't find dependencies list";