From ddc5dc7da3380d68ba841dd84245d40a2fe50c5e Mon Sep 17 00:00:00 2001 From: trws Date: Mon, 6 Nov 2023 19:57:13 +0000 Subject: [PATCH] [@spackbot] updating style on behalf of trws --- lib/spack/spack/build_environment.py | 1 - var/spack/repos/builtin/packages/rust/package.py | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 76080185415..e4171bd751f 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -1026,7 +1026,6 @@ def get_env_modifications(self) -> EnvironmentModifications: run_env_mods.drop("CC", "CXX", "F77", "FC") env.extend(run_env_mods) - return env def _make_buildtime_detectable(self, dep: spack.spec.Spec, env: EnvironmentModifications): diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index bf3609c9779..9cdf8faa449 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import re import os +import re from spack.package import * @@ -94,8 +94,12 @@ def setup_build_environment(self, env): # Manually inject the path of openssl's certs for build. certs = None - for p in ("etc/openssl/cert.pem", "../etc/openssl/cert.pem", - "etc/ssl/certs/ca-bundle.crt", "../etc/ssl/certs/ca-bundle.crt"): + for p in ( + "etc/openssl/cert.pem", + "../etc/openssl/cert.pem", + "etc/ssl/certs/ca-bundle.crt", + "../etc/ssl/certs/ca-bundle.crt", + ): certs = join_path(self.spec["openssl"].prefix, p) if os.path.exists(certs): break