From 5af37b705971eb24a5c9508251ef17d271a70e1a Mon Sep 17 00:00:00 2001 From: becker33 Date: Fri, 3 Mar 2023 01:46:06 +0000 Subject: [PATCH] [@spackbot] updating style on behalf of becker33 --- lib/spack/spack/test/cmd/env.py | 3 ++- lib/spack/spack/util/atomic_update.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index 87207a23d85..950454f6a7f 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -57,6 +57,7 @@ else: use_renameat2 = [False] + @pytest.fixture(params=use_renameat2) def atomic_update_implementations(request, monkeypatch): monkeypatch.setattr(spack.util.atomic_update, "use_renameat2", lambda: request.param) @@ -2181,7 +2182,7 @@ def test_view_link_type( mock_packages, mock_archive, install_mockery, - atomic_update_implementations + atomic_update_implementations, ): filename = str(tmpdir.join("spack.yaml")) viewdir = str(tmpdir.join("view")) diff --git a/lib/spack/spack/util/atomic_update.py b/lib/spack/spack/util/atomic_update.py index ea5093476dc..24921c9a459 100644 --- a/lib/spack/spack/util/atomic_update.py +++ b/lib/spack/spack/util/atomic_update.py @@ -3,13 +3,15 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from contextlib import contextmanager import os +from contextlib import contextmanager + import llnl.util.filesystem as fs from llnl.util.symlink import symlink try: from ctypes import CDLL + libc = CDLL("/lib64/libc.so.6", 0x04) # 0x04 is RTLD_NOLOAD except BaseException: libc = None @@ -49,7 +51,9 @@ def atomic_update_renameat2(src, dest): with open_safely(src) as srcfd: with open_safely(dest) as destfd: try: - libc.renameat2(srcfd, src.encode(), destfd, dest.encode(), 2) # 2 is RENAME_EXCHANGE + libc.renameat2( + srcfd, src.encode(), destfd, dest.encode(), 2 + ) # 2 is RENAME_EXCHANGE if not dest_exists: os.unlink(src) except Exception: