From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILFb-0005Sv-5b for guix-patches@gnu.org; Fri, 24 Nov 2017 16:11:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eILFX-0005sA-55 for guix-patches@gnu.org; Fri, 24 Nov 2017 16:11:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:47806) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eILFX-0005rv-1y for guix-patches@gnu.org; Fri, 24 Nov 2017 16:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eILFW-0005qm-S0 for guix-patches@gnu.org; Fri, 24 Nov 2017 16:11:02 -0500 Subject: [bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eILEo-0005E1-Me for guix-patches@gnu.org; Fri, 24 Nov 2017 16:10:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eILEk-0005Yk-Lu for guix-patches@gnu.org; Fri, 24 Nov 2017 16:10:18 -0500 Received: from mout01.posteo.de ([185.67.36.141]:40703) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eILEj-0005XT-Rw for guix-patches@gnu.org; Fri, 24 Nov 2017 16:10:14 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 31D4020FBD for ; Fri, 24 Nov 2017 22:10:11 +0100 (CET) From: Kei Kebreau Date: Fri, 24 Nov 2017 16:09:58 -0500 Message-Id: <20171124210958.10089-1-kkebreau@posteo.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29432@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf substitution and add stat and getfacl substitutions. [inputs]: Add acl. --- gnu/packages/package-management.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index c7a368116..15c310d6e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages ssh) #:use-module (gnu packages vim) #:use-module (gnu packages serialization) + #:use-module (gnu packages acl) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -520,7 +521,6 @@ transactions from C or Python.") (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-before 'unpack 'n (lambda _ #t)) ;; setup.py mistakenly requires python-magic from PyPi, even ;; though the Python bindings of `file` are sufficient. ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815844 @@ -535,8 +535,15 @@ transactions from C or Python.") (string-append "['" (which "xxd") "',"))) (substitute* "diffoscope/comparators/elf.py" (("@tool_required\\('readelf'\\)") "") - (("\\['readelf',") - (string-append "['" (which "readelf") "',"))) + (("get_tool_name\\('readelf'\\)") + (string-append "'" (which "readelf") "'"))) + (substitute* "diffoscope/comparators/directory.py" + (("@tool_required\\('stat'\\)") "") + (("@tool_required\\('getfacl'\\)") "") + (("\\['stat',") + (string-append "['" (which "stat") "',")) + (("\\['getfacl',") + (string-append "['" (which "getfacl") "',"))) #t)) (add-before 'check 'delete-failing-test (lambda _ @@ -547,6 +554,7 @@ transactions from C or Python.") ("python-debian" ,python-debian) ("python-libarchive-c" ,python-libarchive-c) ("python-tlsh" ,python-tlsh) + ("acl" ,acl) ;for getfacl ("colordiff" ,colordiff) ("xxd" ,xxd) -- 2.15.0