summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-15 13:24:44 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-15 13:24:44 +0000
commita87e3d05e5a9fbdc857bc5032fa924c237967f79 (patch)
treecde8aae6ce76135a1a61e34c16ce6c9acb17653a /perl-install
parent5d45eaf8642f9956074211f707059eaf76690fe4 (diff)
downloaddrakx-backup-do-not-use-a87e3d05e5a9fbdc857bc5032fa924c237967f79.tar
drakx-backup-do-not-use-a87e3d05e5a9fbdc857bc5032fa924c237967f79.tar.gz
drakx-backup-do-not-use-a87e3d05e5a9fbdc857bc5032fa924c237967f79.tar.bz2
drakx-backup-do-not-use-a87e3d05e5a9fbdc857bc5032fa924c237967f79.tar.xz
drakx-backup-do-not-use-a87e3d05e5a9fbdc857bc5032fa924c237967f79.zip
do not try to get synthesis if hdlist is available as an handle on file (typical
for updates).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/pkgs.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index a9c991c37..e5905940a 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -454,11 +454,14 @@ sub psUsingHdlist {
$m->{hdlist_size} = -s $newf; #- keep track of size for post-check.
symlinkf $newf, "/tmp/$hdlist";
- #- copy existing synthesis file too.
- my $newsf = "$prefix/var/lib/urpmi/synthesis.hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
- install_any::getAndSaveFile("Mandrake/base/synthesis.$hdlist", $newsf);
- $m->{synthesis_hdlist_size} = -s $newsf; #- keep track of size for post-check.
- -s $newsf > 0 or unlink $newsf;
+ #- if $fhdlist is defined, this is preferable not to try to find the associated synthesis.
+ unless ($fhdlist) {
+ #- copy existing synthesis file too.
+ my $newsf = "$prefix/var/lib/urpmi/synthesis.hdlist.$fakemedium.cz" . ($hdlist =~ /\.cz2/ && "2");
+ install_any::getAndSaveFile("Mandrake/base/synthesis.$hdlist", $newsf);
+ $m->{synthesis_hdlist_size} = -s $newsf; #- keep track of size for post-check.
+ -s $newsf > 0 or unlink $newsf;
+ }
#- avoid using more than one medium if Cd is not ejectable.
#- but keep all medium here so that urpmi has the whole set.