diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-09-10 19:00:51 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-09-14 15:22:18 +0200 |
| commit | 95278287f4e1eeaf5d96749d6fc9bfc53fb400d0 (patch) | |
| tree | 90cc504d25c680b2fc3fe77994573e517263275f /test/integration/test-bug-595691-empty-and-broken-archive-files | |
| parent | 7f58427b9584686f80cd5eccfdd02c1ace75518a (diff) | |
avoid using global PendingError to avoid failing too often too soon
Our error reporting is historically grown into some kind of mess.
A while ago I implemented stacking for the global error which is used in
this commit now to wrap calls to functions which do not report (all)
errors via return, so that only failures in those calls cause a failure
to propergate down the chain rather than failing if anything
(potentially totally unrelated) has failed at some point in the past.
This way we can avoid stopping the entire acquire process just because a
single source produced an error for example. It also means that after
the acquire process the cache is generated – even if the acquire
process had failures – as we still have the old good data around we can and
should generate a cache for (again).
There are probably more instances of this hiding, but all these looked
like the easiest to work with and fix with reasonable (aka net-positive)
effects.
Diffstat (limited to 'test/integration/test-bug-595691-empty-and-broken-archive-files')
| -rwxr-xr-x | test/integration/test-bug-595691-empty-and-broken-archive-files | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files index 0c02aee30..f73dfdd68 100755 --- a/test/integration/test-bug-595691-empty-and-broken-archive-files +++ b/test/integration/test-bug-595691-empty-and-broken-archive-files @@ -54,6 +54,7 @@ Reading package lists..." "empty archive Packages.$COMPRESS over file" testaptgetupdate "Get:2 file:$APTARCHIVE Packages Err:2 file:$APTARCHIVE Packages Empty files can't be valid archives +Reading package lists... W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS Empty files can't be valid archives E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file" } @@ -70,6 +71,7 @@ Reading package lists..." "empty archive Packages.$COMPRESS over http" testaptgetupdate "Get:2 http://localhost:8080 Packages Err:2 http://localhost:8080 Packages Empty files can't be valid archives +Reading package lists... W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages.${COMPRESS}) Empty files can't be valid archives E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http" } |