summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-07-30 13:51:13 +0000
committerFrancois Pons <fpons@mandriva.com>2003-07-30 13:51:13 +0000
commit1cbf4a27f69b3160a04f7fe18aa83057da64aa39 (patch)
tree29c6c241df5d343accc17ce547800281bc5b41fd
parent6f99b752010aaa74d1d1bcf3f6c36d2bb529d4b3 (diff)
downloaddrakx-1cbf4a27f69b3160a04f7fe18aa83057da64aa39.tar
drakx-1cbf4a27f69b3160a04f7fe18aa83057da64aa39.tar.gz
drakx-1cbf4a27f69b3160a04f7fe18aa83057da64aa39.tar.bz2
drakx-1cbf4a27f69b3160a04f7fe18aa83057da64aa39.tar.xz
drakx-1cbf4a27f69b3160a04f7fe18aa83057da64aa39.zip
allow testing locally, should not avoid pkgs to work in real place.
-rw-r--r--perl-install/pkgs.pm18
1 files changed, 11 insertions, 7 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 74cf1e870..14bccda38 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -320,8 +320,9 @@ sub psUpdateHdlistsDeps {
#- check if current configuration is still up-to-date and do not need to be updated.
foreach (values %{$packages->{mediums}}) {
$_->{selected} || $_->{ignored} or next;
- my $hdlistf = "$prefix/var/lib/urpmi/hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
- my $synthesisf = "$prefix/var/lib/urpmi/synthesis.hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
+ my $urpmidir = -w "$prefix/var/lib/urpmi" ? "$prefix/var/lib/urpmi" : "/tmp";
+ my $hdlistf = "$urpmidir/hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
+ my $synthesisf = "$urpmidir/synthesis.hdlist.$_->{fakemedium}.cz" . ($_->{hdlist} =~ /\.cz2/ && "2");
if (-s $hdlistf != $_->{hdlist_size}) {
install_any::getAndSaveFile("Mandrake/base/$_->{hdlist}", $hdlistf) or die "no $_->{hdlist} found";
symlinkf $hdlistf, "/tmp/$_->{hdlist}";
@@ -335,7 +336,8 @@ sub psUpdateHdlistsDeps {
if ($need_copy) {
#- this is necessary for urpmi.
- install_any::getAndSaveFile("Mandrake/base/$_", "$prefix/var/lib/urpmi/$_") foreach qw(rpmsrate);
+ my $urpmidir = -w "$prefix/var/lib/urpmi" ? "$prefix/var/lib/urpmi" : "/tmp";
+ install_any::getAndSaveFile("Mandrake/base/$_", "$urpmidir/$_") foreach qw(rpmsrate);
}
}
@@ -371,6 +373,7 @@ sub psUsingHdlists {
sub psUsingHdlist {
my ($prefix, $method, $packages, $hdlist, $medium, $rpmsdir, $descr, $selected, $o_fhdlist) = @_;
my $fakemedium = "$descr ($method$medium)";
+ my $urpmidir = -w "$prefix/var/lib/urpmi" ? "$prefix/var/lib/urpmi" : "/tmp";
log::l("trying to read $hdlist for medium $medium");
#- if the medium already exist, use it.
@@ -386,16 +389,16 @@ sub psUsingHdlist {
ignored => !$selected, #- keep track of ignored medium by DrakX.
};
- #- copy hdlist file directly to $prefix/var/lib/urpmi, this will be used
+ #- copy hdlist file directly to urpmi directory, this will be used
#- for getting header of package during installation or after by urpmi.
- my $newf = "$prefix/var/lib/urpmi/hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
+ my $newf = "$urpmidir/hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
-e $newf and do { unlink $newf or die "cannot remove $newf: $!" };
install_any::getAndSaveFile($o_fhdlist || "Mandrake/base/$hdlist", $newf) or do { unlink $newf; die "no $hdlist found" };
$m->{hdlist_size} = -s $newf; #- keep track of size for post-check.
symlinkf $newf, "/tmp/$hdlist";
#- if $o_fhdlist is defined, this is preferable not to try to find the associated synthesis.
- my $newsf = "$prefix/var/lib/urpmi/synthesis.hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
+ my $newsf = "$urpmidir/synthesis.hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
unless ($o_fhdlist) {
#- copy existing synthesis file too.
install_any::getAndSaveFile("Mandrake/base/synthesis.$hdlist", $newsf);
@@ -551,7 +554,8 @@ sub saveCompssUsers {
}
}
}
- output "$prefix/var/lib/urpmi/compssUsers.flat", $flat;
+ my $urpmidir = -w "$prefix/var/lib/urpmi" ? "$prefix/var/lib/urpmi" : "/tmp";
+ output "$urpmidir/compssUsers.flat", $flat;
}
sub setSelectedFromCompssList {