summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-01-13 09:50:10 +0000
committerFrancois Pons <fpons@mandriva.com>2003-01-13 09:50:10 +0000
commitd3785f80768dbb2d4e452e2da02c34d87404f5f6 (patch)
treed2e845aad2ebc7a7cbbafcef017c5ba4063b6146
parent77bc34a182f5994e8fdb3da66ce8216afa3af4e2 (diff)
downloadurpmi-d3785f80768dbb2d4e452e2da02c34d87404f5f6.tar
urpmi-d3785f80768dbb2d4e452e2da02c34d87404f5f6.tar.gz
urpmi-d3785f80768dbb2d4e452e2da02c34d87404f5f6.tar.bz2
urpmi-d3785f80768dbb2d4e452e2da02c34d87404f5f6.tar.xz
urpmi-d3785f80768dbb2d4e452e2da02c34d87404f5f6.zip
fixed bad use of hdlist file (bug 778).
-rw-r--r--urpm.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/urpm.pm b/urpm.pm
index 1280ceb3..edf088e8 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -913,8 +913,8 @@ sub update_media {
$urpm->{log}(_("examining synthesis file [%s]", "$urpm->{statedir}/synthesis.$medium->{hdlist}"));
eval { ($medium->{start}, $medium->{end}) = $urpm->parse_synthesis("$urpm->{statedir}/synthesis.$medium->{hdlist}") };
unless (defined $medium->{start} && defined $medium->{end}) {
- $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$_->{hdlist}"));
- eval { ($_->{start}, $_->{end}) = $urpm->parse_hdlist("$urpm->{statedir}/$_->{hdlist}", packing => 1) };
+ $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$medium->{hdlist}"));
+ eval { ($medium->{start}, $medium->{end}) = $urpm->parse_hdlist("$urpm->{statedir}/$medium->{hdlist}", packing => 1) };
unless (defined $medium->{start} && defined $medium->{end}) {
#- this is almost a fatal error, ignore it by default?
$urpm->{error}(_("problem reading synthesis file of medium \"%s\"", $medium->{name}));
@@ -1017,9 +1017,9 @@ sub update_media {
eval { ($medium->{start}, $medium->{end}) =
$urpm->parse_synthesis("$urpm->{statedir}/synthesis.$medium->{hdlist}") };
unless (defined $medium->{start} && defined $medium->{end}) {
- $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$_->{hdlist}"));
- eval { ($_->{start}, $_->{end}) =
- $urpm->parse_hdlist("$urpm->{statedir}/$_->{hdlist}", packing => 1) };
+ $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$medium->{hdlist}"));
+ eval { ($medium->{start}, $medium->{end}) =
+ $urpm->parse_hdlist("$urpm->{statedir}/$medium->{hdlist}", packing => 1) };
unless (defined $medium->{start} && defined $medium->{end}) {
$urpm->{error}(_("problem reading synthesis file of medium \"%s\"", $medium->{name}));
$medium->{ignore} = 1;
@@ -1179,9 +1179,9 @@ sub update_media {
eval { ($medium->{start}, $medium->{end}) =
$urpm->parse_synthesis("$urpm->{statedir}/synthesis.$medium->{hdlist}") };
unless (defined $medium->{start} && defined $medium->{end}) {
- $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$_->{hdlist}"));
- eval { ($_->{start}, $_->{end}) =
- $urpm->parse_hdlist("$urpm->{statedir}/$_->{hdlist}", packing => 1) };
+ $urpm->{log}(_("examining hdlist file [%s]", "$urpm->{statedir}/$medium->{hdlist}"));
+ eval { ($medium->{start}, $medium->{end}) =
+ $urpm->parse_hdlist("$urpm->{statedir}/$medium->{hdlist}", packing => 1) };
unless (defined $medium->{start} && defined $medium->{end}) {
$urpm->{error}(_("problem reading synthesis file of medium \"%s\"", $medium->{name}));
$medium->{ignore} = 1;