From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 19 Sep 2014 22:12:13 +0000 (+0200)
Subject: relax grep to support newer curl output format
X-Git-Tag: 1.0.9.2~7
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2bd6be8ad24583ed9935f5c5d57c04ba7344111e

relax grep to support newer curl output format

Git-Dch: Ignore
---

diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect
index 73352a28c..bc744d6f2 100755
--- a/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@ -25,6 +25,11 @@ msgtest 'download of a file does not work if' 'https redirected to http'
 downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass
 
 msgtest 'libcurl has forbidden access in last request to' 'http resource'
-grep -q -- 'Protocol http not supported or disabled in libcurl' curloutput && msgpass || msgfail
+if grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' curloutput; then
+	msgpass
+else
+	cat curloutput
+	msgfail
+fi