diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
| commit | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (patch) | |
| tree | 732e4b2ff090c01bb07dedeefe25cd517070c256 /test/integration/test-apt-progress-fd-error | |
| parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
| parent | d916e2a93b798e29d342e9498266767c5be8e2a5 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/cachefilter.h
configure.ac
debian/changelog
Diffstat (limited to 'test/integration/test-apt-progress-fd-error')
| -rwxr-xr-x | test/integration/test-apt-progress-fd-error | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/integration/test-apt-progress-fd-error b/test/integration/test-apt-progress-fd-error index 96d66371a..a47095b9b 100755 --- a/test/integration/test-apt-progress-fd-error +++ b/test/integration/test-apt-progress-fd-error @@ -18,5 +18,10 @@ setupaptarchive exec 3> apt-progress.log testfailure aptget install foo1 foo2 -y -o APT::Status-Fd=3 msgtest "Ensure correct error message" -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 && msgpass || (cat apt-progress.log && msgfail) +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 + msgpass +else + cat apt-progress.log + msgfail +fi |