Attachment 192436 Details for Bug 227447 – Proposed patch

[patch] Proposed patch

rbtools-no-diff-check.diff (text/plain), 1.67 KB, created by Raphael Kubo da Costa on 2018-04-11 17:22:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2018-04-11 17:22:16 UTC

Size: 1.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 467078)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	${ORIGNAME:tl}
> DISTVERSION=	0.7.11
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://downloads.reviewboard.org/releases/${ORIGNAME}/${DISTVERSION:R}/
> DISTNAME=	${ORIGNAME}-${DISTVERSION}
>Index: files/patch-rbtools_utils_checks.py
>===================================================================
>--- files/patch-rbtools_utils_checks.py	(nonexistent)
>+++ files/patch-rbtools_utils_checks.py	(working copy)
>@@ -0,0 +1,21 @@
>+Allow rbtools to work on systems with BSD diff instead of GNU diff (which is
>+the case for FreeBSD 12 and later).
>+
>+Several other places in the code base call diff directly, and the test suite
>+passes with BSD diff as well.
>+
>+--- rbtools/utils/checks.py.orig	2018-04-11 17:08:14 UTC
>++++ rbtools/utils/checks.py
>+@@ -35,6 +35,12 @@ def check_install(command):
>+ 
>+ def check_gnu_diff():
>+     """Checks if GNU diff is installed, and informs the user if it's not."""
>++
>++    # On FreeBSD 12+, diff(1) is BSD diff by default, and it does not accept a
>++    # --version parameter. It should be otherwise compatible with GNU diff, so
>++    # we just make this function do nothing instead.
>++    return
>++
>+     has_gnu_diff = False
>+ 
>+     try:
>
>Property changes on: files/patch-rbtools_utils_checks.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 227447: 192436