diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 14:17:04 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 14:17:04 +0200 |
| commit | 68be2fbb252a71303046e2ca7866cd659a91b585 (patch) | |
| tree | d9ad50c5fa43943c409fed2e7e8d476f4603fd42 /test/integration/test-apt-progress-fd-error | |
| parent | e29a7a394cfd41e8bad81535e0a8c07654f34bf6 (diff) | |
| parent | 15901516326737a67f2a9af26cd7e434162de019 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into debian/sid
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error index a47095b9b..632300765 100755 --- a/test/integration/test-apt-progress-fd-error +++ b/test/integration/test-apt-progress-fd-error @@ -18,7 +18,7 @@ setupaptarchive exec 3> apt-progress.log testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 msgtest "Ensure correct error message" -if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:40:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then +if grep -q "aptarchive/pool/foo2_0.8.15_amd64.deb:36.3636:trying to overwrite '/usr/bin/file-conflict', which is also in package foo1 0.8.15" apt-progress.log; then msgpass else cat apt-progress.log |