spack/Fix-error-during-documentation-build-due-to-recursive-module-inclusion.patch
Egbert Eich d67b8bdc5b - Update to version 0.22.2
* Bugfixes
    - Forward compatibility with Spack 0.23 packages with language
      dependencies.
    - Forward compatibility with `urllib` from Python 3.12.6+.
    - Bump vendored `archspec` for better aarch64 support.
    - Fix regression in `{variants.X}` and `{variants.X.value}`
      format strings.
    - Ensure shell escaping of environment variable values in load
      and activate commands.
    - Fix an issue where `spec[pkg]` considers specs outside the
      current DAG.
    - Do not halt concretization on unknown variants in externals.
    - Improve validation of `develop` config section/
    - Explicitly disable `ccache` if turned off in config, to
      avoid cache pollution.
    - Improve backwards compatibility in `include_concrete`.
    - Fix issue where package tags were sometimes repeated.
    - Make `setup-env.sh` "sourced only" by dropping execution bits.
    - Make certain source/binary fetch errors recoverable instead
      of a hard error.
    - Remove debug statements in package hash computation.
    - Remove redundant clingo warnings.
    - Remove hard-coded layout version.
    - Do not initialize previous store state in `use_store`.
  * Package updates
    - `chapel` major update/

OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=109
2024-11-01 12:27:09 +00:00

28 lines
956 B
Diff

From c24349cb54442da8e49fd40a299453e56b404a90 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 7 Apr 2022 20:25:46 +0200
Subject: [PATCH] Fix error during documentation build due to recursive module
inclusion
Signed-off-by: Egbert Eich <eich@suse.com>
Signed-off-by: Egbert Eich <eich@suse.de>
---
lib/spack/spack/environment/environment.py | 4 ++++
1 file changed, 4 insertions(+)
Index: spack-0.20.3/lib/spack/spack/environment/environment.py
===================================================================
--- spack-0.20.3.orig/lib/spack/spack/environment/environment.py
+++ spack-0.20.3/lib/spack/spack/environment/environment.py
@@ -40,6 +40,10 @@ import spack.stage
import spack.store
import spack.subprocess_context
import spack.user_environment as uenv
+try:
+ import spack.user_environment as uenv
+except AttributeError:
+ pass
import spack.util.cpus
import spack.util.environment
import spack.util.hash