summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2020-01-15 11:32:18 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2020-01-15 11:32:18 -0600
commitf8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b (patch)
treeb2c7bd7024eb5c3ee97429d1f5e330f458bcc6d4 /var
parent726a662c2c2fe3e366005f188b4c2fa41bb3f0dc (diff)
downloadspack-f8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b.tar.gz
spack-f8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b.tar.bz2
spack-f8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b.tar.xz
spack-f8acb95ad3f9d6e082abe7d6b2a705f9a6143b6b.zip
Convert encoding of script in interproscan (#14356)
One of the perl scripts was encoded with ISO-8859-1, which caused the sbang replacement process to fail when spack uses python3. This PR converts the ps_scan script to UTF-8 encoding.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/interproscan/package.py1
-rw-r--r--var/spack/repos/builtin/packages/interproscan/ps_scan.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/interproscan/package.py b/var/spack/repos/builtin/packages/interproscan/package.py
index fe0a3acd1b..7ffb7c1da8 100644
--- a/var/spack/repos/builtin/packages/interproscan/package.py
+++ b/var/spack/repos/builtin/packages/interproscan/package.py
@@ -42,6 +42,7 @@ class Interproscan(Package):
patch('large-gid.patch', when='@5:')
patch('non-interactive.patch', when='@:4.8')
+ patch('ps_scan.patch', when='@:4.8')
def install(self, spec, prefix):
with working_dir('core'):
diff --git a/var/spack/repos/builtin/packages/interproscan/ps_scan.patch b/var/spack/repos/builtin/packages/interproscan/ps_scan.patch
new file mode 100644
index 0000000000..f34aa2c432
--- /dev/null
+++ b/var/spack/repos/builtin/packages/interproscan/ps_scan.patch
@@ -0,0 +1,12 @@
+diff -ru a/bin/ps_scan.pl b/bin/ps_scan.pl
+--- a/bin/ps_scan.pl 2020-01-01 14:07:54.243869822 -0600
++++ b/bin/ps_scan.pl 2020-01-01 14:08:03.786850313 -0600
+@@ -8,7 +8,7 @@
+ # Authors:
+ # Alexandre Gattiker
+ # Edouard de Castro; E-mail: ecastro@isb-sib.ch
+-# Béatrice Cuche (evaluated_by post-processing)
++# Béatrice Cuche (evaluated_by post-processing)
+ #
+ # Contributions:
+ # Lorenza Bordoli (repeat method)