diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-04-05 13:10:23 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-04-05 13:10:23 +0000 |
| commit | 262d80a927a4d1112474bd6b371fb397902b64b6 (patch) | |
| tree | ae910aa36adc223bb2e487200ee26769a40c462d | |
| parent | 1d601649148def6f9502f16ce5303ffbcca92f03 (diff) | |
| download | urpmi-262d80a927a4d1112474bd6b371fb397902b64b6.tar urpmi-262d80a927a4d1112474bd6b371fb397902b64b6.tar.gz urpmi-262d80a927a4d1112474bd6b371fb397902b64b6.tar.bz2 urpmi-262d80a927a4d1112474bd6b371fb397902b64b6.tar.xz urpmi-262d80a927a4d1112474bd6b371fb397902b64b6.zip | |
Revert previous change: some failures should be silent, since one retries afterwards
| -rw-r--r-- | urpm.pm | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1424,7 +1424,6 @@ 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}}; } @@ -1458,7 +1457,6 @@ 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}"); } @@ -1490,7 +1488,6 @@ 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}) { @@ -1555,7 +1552,6 @@ 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})); @@ -1672,10 +1668,7 @@ this could happen if you mounted manually the directory when creating the medium "$urpm->{cachedir}/partial/$local_list", "$urpm->{cachedir}/partial/list"); }; - if ($@) { - $urpm->{error}(N("...retrieving failed: %s", $@)); - unlink "$urpm->{cachedir}/partial/list"; - } + $@ and unlink "$urpm->{cachedir}/partial/list"; -s "$urpm->{cachedir}/partial/list" and last; } } @@ -1704,10 +1697,7 @@ this could happen if you mounted manually the directory when creating the medium "$urpm->{cachedir}/partial/$local_pubkey", "$urpm->{cachedir}/partial/pubkey"); }; - if ($@) { - $urpm->{error}(N("...retrieving failed: %s", $@)); - unlink "$urpm->{cachedir}/partial/pubkey"; - } + $@ and unlink "$urpm->{cachedir}/partial/pubkey"; -s "$urpm->{cachedir}/partial/pubkey" and last; } } |