diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-26 22:10:35 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-27 03:51:44 +0100 |
commit | f58339ad566233a2e1252dcf309480029f84ab48 (patch) | |
tree | 41a9afbd9286c3cc21990b09882b0a2179203e84 | |
parent | fc328b35ddc6e37c183383d5f8c6bb973dd0cc9b (diff) |
Work around curl -sS -I printing `HTTP/1.0 200 Connection established' before the actual header, so dgit works with https_proxy set (!)
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 4111fcd..3a54ce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ dgit (1.1~~) unstable; urgency=low but only does it if not disabled in config). * Set up git user.email and user.name from distro access config or DEBEMAIL/DEBFULLNAME. Closes:#793410. + * Work around curl -sS -I printing `HTTP/1.0 200 Connection established' + before the actual header, so dgit works with https_proxy set (!) -- @@ -1157,6 +1157,9 @@ sub check_for_git () { my $url = "$prefix/$package$suffix"; my @cmd = (qw(curl -sS -I), $url); my $result = cmdoutput @cmd; + $result =~ s/^\S+ 200 .*\n\r?\n//; + # curl -sS -I with https_proxy prints + # HTTP/1.0 200 Connection established $result =~ m/^\S+ (404|200) /s or fail "unexpected results from git check query - ". Dumper($prefix, $result); |