]> git.saurik.com Git - apt.git/blobdiff - test/integration/test-apt-progress-fd-error
Czech program translation update
[apt.git] / test / integration / test-apt-progress-fd-error
index 96d66371aa5e1f754516a295de4572461c75809d..632300765529555df02e4bf3ac00f88169855a40 100755 (executable)
@@ -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: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
+       msgfail
+fi