public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/python-magic/files/, dev-python/python-magic/
Date: Tue,  3 Mar 2020 06:17:17 +0000 (UTC)	[thread overview]
Message-ID: <1583216224.d59faf751cc6da052f20b2b6edeb1330a303aac4.mattst88@gentoo> (raw)

commit:     d59faf751cc6da052f20b2b6edeb1330a303aac4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  3 06:15:52 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 06:17:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59faf75

dev-python/python-magic: Add patch to fix tests

Closes: https://bugs.gentoo.org/663610
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../python-magic-0.4.15-fix-gzip-test-2.patch      | 26 ++++++++++++++++++++++
 .../python-magic/python-magic-0.4.15-r1.ebuild     |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
new file mode 100644
index 00000000000..4dd362ebb61
--- /dev/null
+++ b/dev-python/python-magic/files/python-magic-0.4.15-fix-gzip-test-2.patch
@@ -0,0 +1,26 @@
+From 18c909c4c98463d8292a7d1733aec007f178f1e5 Mon Sep 17 00:00:00 2001
+From: Adam Hupp <adam@hupp.org>
+Date: Sat, 11 Jan 2020 21:57:24 -0800
+Subject: [PATCH] Hopefully fix #105
+
+---
+ test/test.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index 62e8a03..c15227d 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -78,7 +78,11 @@ def test_descriptions(self):
+                  'gzip compressed data, was "test", last modified'
+                  ': Sun Jun 29 01:32:52 2008, from Unix',
+                  'gzip compressed data, was "test", last modified'
+-                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15'),
++                 ': Sun Jun 29 01:32:52 2008, from Unix, original size 15',
++                 'gzip compressed data, was "test", '
++                 'last modified: Sun Jun 29 01:32:52 2008, '
++                 'from Unix, original size modulo 2^32 15'
++                ),
+                 'text.txt': 'ASCII text',
+             }, buf_equals_file=False)
+         finally:

diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index 8f25dcdad7e..e17297d1813 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -31,6 +31,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-gzip-test.patch"
 	# https://github.com/ahupp/python-magic/commit/4bda684f8b461cc1f69593799efcf6afe8397756
 	"${FILESDIR}/${P}-fix-jpeg-test.patch"
+	# https://github.com/ahupp/python-magic/commit/18c909c4c98463d8292a7d1733aec007f178f1e5
+	"${FILESDIR}/${P}-fix-gzip-test-2.patch"
 )
 
 python_test() {


             reply	other threads:[~2020-03-03  6:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-03  6:17 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-11-25 16:57 [gentoo-commits] repo/gentoo:master commit in: dev-python/python-magic/files/, dev-python/python-magic/ Michał Górny
2018-08-23  8:17 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1583216224.d59faf751cc6da052f20b2b6edeb1330a303aac4.mattst88@gentoo \
    --to=mattst88@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox