diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-09-22 12:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-22 11:04:23 -0600 |
| commit | c118c7733b9e20f079bb19b84b8ad60cacd2a673 (patch) | |
| tree | 70401e07c8d3e09dc1b1379c2577421a1d103593 | |
| parent | f73f0f861dc5d2f14ed8f4ac563d3e46b66be4ae (diff) | |
| download | spack-c118c7733b9e20f079bb19b84b8ad60cacd2a673.tar.gz spack-c118c7733b9e20f079bb19b84b8ad60cacd2a673.tar.bz2 spack-c118c7733b9e20f079bb19b84b8ad60cacd2a673.tar.xz spack-c118c7733b9e20f079bb19b84b8ad60cacd2a673.zip | |
*: no loop over files with filter_file(*files) (#46420)
* *: no loop over files with filter_file(*files)
* scalpel: revert
5 files changed, 9 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index bfba305f62..fe979ec5b9 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -168,13 +168,11 @@ class Augustus(MakefilePackage): pattern = "^#!.*" repl = f"#!{self.spec['perl'].command.path}" files = glob.glob("*.pl") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) repl = f"#!{self.spec['python'].command.path}" files = glob.glob("*.py") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) def setup_build_environment(self, env): htslib = self.spec["htslib"].prefix diff --git a/var/spack/repos/builtin/packages/braker/package.py b/var/spack/repos/builtin/packages/braker/package.py index d9db186884..6180c1895b 100644 --- a/var/spack/repos/builtin/packages/braker/package.py +++ b/var/spack/repos/builtin/packages/braker/package.py @@ -63,8 +63,7 @@ class Braker(Package): pattern = "^#!.*/usr/bin/env perl" repl = "#!{0}".format(self.spec["perl"].command.path) files = glob.iglob("*.pl") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) def setup_run_environment(self, env): env.prepend_path("PERL5LIB", self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/fplo/package.py b/var/spack/repos/builtin/packages/fplo/package.py index f294fc05d3..61e8f4da09 100644 --- a/var/spack/repos/builtin/packages/fplo/package.py +++ b/var/spack/repos/builtin/packages/fplo/package.py @@ -136,5 +136,4 @@ class Fplo(MakefilePackage): pattern = "^#!.*/usr/bin/perl" repl = "#!{0}".format(self.spec["perl"].command.path) files = ["fconv2", "fconvdens2", "fdowngrad.pl", "fout2in", "grBhfat", "grpop"] - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) diff --git a/var/spack/repos/builtin/packages/genemark-et/package.py b/var/spack/repos/builtin/packages/genemark-et/package.py index 8a344157fe..0a65beaa62 100644 --- a/var/spack/repos/builtin/packages/genemark-et/package.py +++ b/var/spack/repos/builtin/packages/genemark-et/package.py @@ -62,8 +62,7 @@ class GenemarkEt(Package): pattern = "^#!.*/usr/bin/perl" repl = "#!{0}".format(self.spec["perl"].command.path) files = glob.iglob("*.pl") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) def setup_run_environment(self, env): env.prepend_path("PERL5LIB", self.prefix.lib) diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index 6821930bb1..ca96899314 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -89,24 +89,20 @@ class Hisat2(MakefilePackage): pattern = "^#!.*/usr/bin/env python" repl = f"#!{self.spec['python'].command.path}" files = ["hisat2-build", "hisat2-inspect"] - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) pattern = "^#!.*/usr/bin/env perl" repl = f"#!{self.spec['perl'].command.path}" files = ["hisat2"] - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) pattern = "^#!.*/usr/bin/env python3" repl = f"#!{self.spec['python'].command.path}" files = glob.glob("*.py") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) with working_dir(self.prefix.scripts): pattern = "^#!.*/usr/bin/perl" repl = f"#!{self.spec['perl'].command.path}" files = glob.glob("*.pl") - for file in files: - filter_file(pattern, repl, *files, backup=False) + filter_file(pattern, repl, *files, backup=False) |