summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-04-02 20:53:00 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-04-02 20:53:00 +0000
commite01a3349de709db37d8983bbf01fc4b27072a0fa (patch)
treed919e1049fc3dabdf4904071ca08d3a7628e9c91 /urpm.pm
parent545484af10cc2c4bb93435a26ee9a37b8501e216 (diff)
downloadurpmi-e01a3349de709db37d8983bbf01fc4b27072a0fa.tar
urpmi-e01a3349de709db37d8983bbf01fc4b27072a0fa.tar.gz
urpmi-e01a3349de709db37d8983bbf01fc4b27072a0fa.tar.bz2
urpmi-e01a3349de709db37d8983bbf01fc4b27072a0fa.tar.xz
urpmi-e01a3349de709db37d8983bbf01fc4b27072a0fa.zip
More error messages should be reported on fatal download errors (bug #21813)
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm14
1 files changed, 12 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index f56349bb..9de8e35a 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1424,6 +1424,7 @@ this could happen if you mounted manually the directory when creating the medium
reduce_pathname("$medium->{url}/reconfig.urpmi"),
);
};
+ $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
if (-s $reconfig_urpmi && $urpm->reconfig_urpmi($reconfig_urpmi, $medium->{name})) {
$media_redone{$medium->{name}} = 1, redo MEDIA unless $media_redone{$medium->{name}};
}
@@ -1457,6 +1458,7 @@ this could happen if you mounted manually the directory when creating the medium
$urpm->{sync}($syncopts, reduce_pathname("$medium->{url}/../descriptions"));
};
}
+ $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
if (-e "$urpm->{cachedir}/partial/descriptions") {
urpm::util::move("$urpm->{cachedir}/partial/descriptions", "$urpm->{statedir}/descriptions.$medium->{name}");
}
@@ -1488,6 +1490,7 @@ this could happen if you mounted manually the directory when creating the medium
);
}
};
+ $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
if (!$@ && -e "$urpm->{cachedir}/partial/MD5SUM" && -s _ > 32) {
recompute_local_md5sum($urpm, $medium, $options{force} >= 2);
if ($medium->{md5sum}) {
@@ -1552,6 +1555,7 @@ this could happen if you mounted manually the directory when creating the medium
reduce_pathname("$medium->{url}/$with_hdlist"),
);
};
+ $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
if (!$@ && -e "$urpm->{cachedir}/partial/$basename" && -s _ > 32) {
$medium->{with_hdlist} = $with_hdlist;
$urpm->{log}(N("found probed hdlist (or synthesis) as %s", $medium->{with_hdlist}));
@@ -1668,7 +1672,10 @@ this could happen if you mounted manually the directory when creating the medium
"$urpm->{cachedir}/partial/$local_list",
"$urpm->{cachedir}/partial/list");
};
- $@ and unlink "$urpm->{cachedir}/partial/list";
+ if ($@) {
+ $urpm->{error}(N("...retrieving failed: %s", $@));
+ unlink "$urpm->{cachedir}/partial/list";
+ }
-s "$urpm->{cachedir}/partial/list" and last;
}
}
@@ -1697,7 +1704,10 @@ this could happen if you mounted manually the directory when creating the medium
"$urpm->{cachedir}/partial/$local_pubkey",
"$urpm->{cachedir}/partial/pubkey");
};
- $@ and unlink "$urpm->{cachedir}/partial/pubkey";
+ if ($@) {
+ $urpm->{error}(N("...retrieving failed: %s", $@));
+ unlink "$urpm->{cachedir}/partial/pubkey";
+ }
-s "$urpm->{cachedir}/partial/pubkey" and last;
}
}