Attachment 215580 Details for Bug 246773 – sysutils/py-diffoscope: Update to 147

[patch] sysutils/py-diffoscope: Update to 147

0001-sysutils-py-diffoscope-Update-to-147.patch (text/plain), 2.50 KB, created by Fabian Keil on 2020-06-15 12:03:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2020-06-15 12:03:16 UTC

Size: 2.50 KB

patch

obsolete

>From aa2bb8ba8454351f5256b50beed4c31d1ad0863a Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Sat, 23 May 2020 12:49:52 +0200
>Subject: [PATCH] sysutils/py-diffoscope: Update to 147
>
>- Add a patch from Mattia Rizzolo to prevent tests
>  from failing due to the no-tlsh-module warning.
>
>The change logs for 145, 146 and 147 are available at:
>https://lists.reproducible-builds.org/pipermail/rb-general/2020-May/001947.html
>https://lists.reproducible-builds.org/pipermail/rb-general/2020-May/001948.html
>https://lists.reproducible-builds.org/pipermail/rb-general/2020-June/001964.html
>---
> sysutils/py-diffoscope/Makefile                       |  2 +-
> sysutils/py-diffoscope/distinfo                       |  6 +++---
> sysutils/py-diffoscope/files/patch-diffoscope_main.py | 11 +++++++++++
> 3 files changed, 15 insertions(+), 4 deletions(-)
> create mode 100644 sysutils/py-diffoscope/files/patch-diffoscope_main.py
>
>diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile
>index 8840142ef652..3d6c0d740f73 100644
>--- a/sysutils/py-diffoscope/Makefile
>+++ b/sysutils/py-diffoscope/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	diffoscope
>-PORTVERSION=	144
>+PORTVERSION=	147
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff --git a/sysutils/py-diffoscope/distinfo b/sysutils/py-diffoscope/distinfo
>index 61f300a436c2..f8a523c3749a 100644
>--- a/sysutils/py-diffoscope/distinfo
>+++ b/sysutils/py-diffoscope/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589766564
>-SHA256 (diffoscope-144.tar.gz) = 9a45464b7b7184fa1ad2af9c52ebac8f00b3dd5dcf9e15dfc00c653c26fcc345
>-SIZE (diffoscope-144.tar.gz) = 1569864
>+TIMESTAMP = 1591954939
>+SHA256 (diffoscope-147.tar.gz) = 5b5fdaa4d900c891b319e4b9a006eb16824a0b61fdbe15e75acbbe35602e2da6
>+SIZE (diffoscope-147.tar.gz) = 1570418
>diff --git a/sysutils/py-diffoscope/files/patch-diffoscope_main.py b/sysutils/py-diffoscope/files/patch-diffoscope_main.py
>new file mode 100644
>index 000000000000..4b9ecc7d85f0
>--- /dev/null
>+++ b/sysutils/py-diffoscope/files/patch-diffoscope_main.py
>@@ -0,0 +1,11 @@
>+--- diffoscope/main.py.orig	2020-06-11 11:45:39 UTC
>++++ diffoscope/main.py
>+@@ -658,7 +658,7 @@ def run_diffoscope(parsed_args):
>+ 
>+     ProfileManager().setup(parsed_args)
>+     PresenterManager().configure(parsed_args)
>+-    if not tlsh:
>++    if not tlsh and "PYTEST_CURRENT_TEST" not in os.environ:
>+         logger.warning(
>+             'Fuzzy-matching is currently disabled as the "tlsh" module is unavailable.'
>+         )
>-- 
>2.26.2
>

Actions: View | Diff

Attachments on bug 246773: 214907 | 215316 | 215580