nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icedtea@3.5.0: Properly handle decoding error while substituting. 

* gnu/packages/java.scm (icedtea-8)[arguments] <patch-jni-libs>: Change
'encoding-error to 'decoding-error, which is what Guile 2.2 raises when
failing to decode an input file.
This commit is contained in:
Ludovic Courtès 2017-08-03 22:46:14 +02:00
parent aa9780daf9
commit c8737b1e41
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/java.scm
View File

@ -1602,7 +1602,7 @@ IcedTea build harness.")
(string-append "lib" name ".so"))))) (string-append "lib" name ".so")))))
(for-each (for-each
(lambda (file) (lambda (file)
(catch 'encoding-error (catch 'decoding-error
(lambda () (lambda ()
(substitute* file (substitute* file
(("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"