From 2d2a1c82d465d346b6ea2592591d85d97bcb2824 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Wed, 1 Mar 2023 06:17:46 -0600 Subject: docbook: resolve conflict in spack env view (#35682) If the docbook packages - docbook-xml - docbook-xsl are installed in a spack environment view the catalog files will be in conflict in the view directory. This PR resolves that by adding an appropriate prefix to each catalog name so that they are unique in the view. The resulting XML_CATALOG_FILES environment variable will then be able to point to both of them. --- var/spack/repos/builtin/packages/docbook-xml/package.py | 2 +- var/spack/repos/builtin/packages/docbook-xsl/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/docbook-xml/package.py b/var/spack/repos/builtin/packages/docbook-xml/package.py index 8434340af1..c5d4900ea5 100644 --- a/var/spack/repos/builtin/packages/docbook-xml/package.py +++ b/var/spack/repos/builtin/packages/docbook-xml/package.py @@ -26,7 +26,7 @@ class DocbookXml(Package): @property def catalog(self): - return join_path(self.prefix, "catalog") + return join_path(self.prefix, "xml-catalog") @run_after("install") def config_docbook(self): diff --git a/var/spack/repos/builtin/packages/docbook-xsl/package.py b/var/spack/repos/builtin/packages/docbook-xsl/package.py index 51a8c9a8e4..a98f0d05dc 100644 --- a/var/spack/repos/builtin/packages/docbook-xsl/package.py +++ b/var/spack/repos/builtin/packages/docbook-xsl/package.py @@ -29,7 +29,7 @@ class DocbookXsl(Package): @property def catalog(self): - return join_path(self.prefix, "catalog") + return join_path(self.prefix, "xsl-catalog") @run_after("install") def config_docbook(self): -- cgit v1.2.3-70-g09d2