#417 source-lookaside: Use Accept: */* to get the sources tarballs
Merged by mvadkert. Opened by churchyard.
churchyard/standard-test-roles anubis  into  master

Download 417.patch

Otherwise, the Fedora URL returns an Anubis HTML page.
Which in turn leads to:

STDERR:
+ umask 022
+ cd /var/str//source
+ cd /var/str/source
+ rm -rf urllib3-1.24.2
+ /usr/bin/tar -xof /var/str/urllib3-1.24.2.tar.gz
gzip: stdin: not in gzip format
/usr/bin/tar: Child returned status 1
/usr/bin/tar: Error is not recoverable: exiting now
error: Bad exit status from /var/tmp/rpm-tmp.6cjM3o (%prep)
    Bad exit status from /var/tmp/rpm-tmp.6cjM3o (%prep)

Consider:

>>> retrieve('https://src.fedoraproject.org/repo/pkgs/rpms/python-urllib3/urllib3-1.24.2.tar.gz/sha512/08e8d896f57eb9af5511d07002859f87f2a7bddbd5e66468908188dfe13d2e3985a8cdd2da12d06d0b337945ca8314c1f026d4e82badf23a09bf686fa121e863/urllib3-1.24.2.tar.gz', '.')
'./urllib3-1.24.2.tar.gz'

Before:

$ file urllib3-1.24.2.tar.gz
urllib3-1.24.2.tar.gz: HTML document, Unicode text, UTF-8 text, with very long lines (2388)
$ head urllib3-1.24.2.tar.gz
<!doctype html><html lang="en"><head><title>Making sure you&#39;re not a bot!</title>...

After:

$ file urllib3-1.24.2.tar.gz
urllib3-1.24.2.tar.gz: gzip compressed data, from Unix, original size modulo 2^32 962560

Looks good, but also the spec file fix will be needed:

 [nix]  git diff --no-ext-diff
diff --git a/python-urllib3.spec b/python-urllib3.spec
index ad769b9..baaa20b 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -81,12 +81,12 @@ Python3 HTTP module with connection pooling and file POST abilities.
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch 1 -p1
+%patch 2 -p1
+%patch 3 -p1
+%patch 4 -p1
+%patch 5 -p1
+%patch 6 -p1
 # Make sure that the RECENT_DATE value doesn't get too far behind what the current date is.
 # RECENT_DATE must not be older that 2 years from the build time, or else test_recent_date

Seems the version of rpm we have on workers has obsoleted the old patch syntax

Commit 9972866c fixes this pull-request

Pull-Request has been merged by mvadkert

Pull-Request has been merged by mvadkert

Metadata