[bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[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

[bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

On Fri, Nov 24, 2017 at 04:09:58PM -0500, Kei Kebreau wrote:
> * gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf
> substitution and add stat and getfacl substitutions.
> [inputs]: Add acl.

Can you add an example of the error messages in the commit message?
Otherwise LGTM.

> @@ -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

Some leftover debugging? :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Fri, Nov 24, 2017 at 04:09:58PM -0500, Kei Kebreau wrote:
>> * gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf
>> substitution and add stat and getfacl substitutions.
>> [inputs]: Add acl.
>
> Can you add an example of the error messages in the commit message?
> Otherwise LGTM.
>

Like this?

Errors fixed include the following:
  "FileNotFoundError: [Errno 2] No such file or directory: 'readelf'"
  "diffoscope.comparators.directory: Unable to find 'getfacl', some
   directory metadata differences might not be noticed."
  "diffoscope.comparators.directory: Unable to find 'stat'"
>> @@ -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
>
> Some leftover debugging? :)

You know it! ;)
I figured out that this is unnecessary if one uses --keep-failed when
building with multiple rounds.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#29432] [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

On Sat, Nov 25, 2017 at 12:51:52PM -0500, Kei Kebreau wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Fri, Nov 24, 2017 at 04:09:58PM -0500, Kei Kebreau wrote:
> >> * gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf
> >> substitution and add stat and getfacl substitutions.
> >> [inputs]: Add acl.
> >
> > Can you add an example of the error messages in the commit message?
> > Otherwise LGTM.
> >
> 
> Like this?
> 
> Errors fixed include the following:
>   "FileNotFoundError: [Errno 2] No such file or directory: 'readelf'"
>   "diffoscope.comparators.directory: Unable to find 'getfacl', some
>    directory metadata differences might not be noticed."
>   "diffoscope.comparators.directory: Unable to find 'stat'"

Sure!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#29432: [PATCH] gnu: diffoscope: Fix error messages related to comparison tools.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

Leo Famulari <leo@famulari.name> writes:

> On Sat, Nov 25, 2017 at 12:51:52PM -0500, Kei Kebreau wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Fri, Nov 24, 2017 at 04:09:58PM -0500, Kei Kebreau wrote:
>> >> * gnu/packages/package-management.scm (diffoscope)[arguments]: Replace readelf
>> >> substitution and add stat and getfacl substitutions.
>> >> [inputs]: Add acl.
>> >
>> > Can you add an example of the error messages in the commit message?
>> > Otherwise LGTM.
>> >
>> 
>> Like this?
>> 
>> Errors fixed include the following:
>>   "FileNotFoundError: [Errno 2] No such file or directory: 'readelf'"
>>   "diffoscope.comparators.directory: Unable to find 'getfacl', some
>>    directory metadata differences might not be noticed."
>>   "diffoscope.comparators.directory: Unable to find 'stat'"
>
> Sure!

Pushed to master as 2af6be91d59ad5aefe01e90aa9045e26d8667098. Thank you
for the review!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]