diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:55:06 +0100 |
| commit | 9397ea947c23c0957a683152360909810340abce (patch) | |
| tree | 6b29e35b9ef602c15d0aab20eefdec3138eb4692 /test/integration/test-apt-update-nofallback | |
| parent | 87ecd6a2d719aeaeedd99dd500b467e966376f1c (diff) | |
| parent | 6e2261d0f250406058d66b360080aa986953ae19 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more-acquire-guessing
Conflicts:
apt-pkg/acquire-item.cc
Diffstat (limited to 'test/integration/test-apt-update-nofallback')
| -rwxr-xr-x | test/integration/test-apt-update-nofallback | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback index 831fc67eb..e82a976a6 100755 --- a/test/integration/test-apt-update-nofallback +++ b/test/integration/test-apt-update-nofallback @@ -195,7 +195,7 @@ test_release_gpg_to_invalid_release_release_gpg() testequal "W: An error occurred during the signature verification. The repository is not updated and the previous index files will be used. GPG error: file: unstable Release.gpg: The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> -W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg +W: Failed to fetch file:${APTARCHIVE}/dists/unstable/Release.gpg The following signatures were invalid: BADSIG 5A90D141DBAC8DAE Joe Sixpack (APT Testcases Dummy) <joe@example.org> W: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq |