From 23d5bbc42580a03070000321b91f691deccb40ea Mon Sep 17 00:00:00 2001 From: Douglas Jacobsen Date: Thu, 30 Jan 2025 10:07:38 -0700 Subject: [PATCH] Add target information to spack software output --- .../package_managers/spack-lightweight/package_manager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/ramble/repos/builtin/package_managers/spack-lightweight/package_manager.py b/var/ramble/repos/builtin/package_managers/spack-lightweight/package_manager.py index 370482335..24a210504 100644 --- a/var/ramble/repos/builtin/package_managers/spack-lightweight/package_manager.py +++ b/var/ramble/repos/builtin/package_managers/spack-lightweight/package_manager.py @@ -1292,6 +1292,7 @@ def _package_dict_from_str(self, in_str): "version": "", "compiler": "", "compiler_version": "", + "target": "", "variants": "", } @@ -1317,7 +1318,10 @@ def _package_dict_from_str(self, in_str): info_dict["compiler_version"] = parts[3] if len(parts) >= 5: - info_dict["variants"] = ",".join(parts[4:]).strip() + info_dict["target"] = parts[4] + + if len(parts) >= 6: + info_dict["variants"] = ",".join(parts[5:]).strip() if info_dict["name"]: return info_dict @@ -1334,7 +1338,7 @@ def package_provenance(self): """ find_args = [ "find", - '--format="{name},{version},{compiler.name},{compiler.version},{variants}"', + '--format="{name},{version},{compiler.name},{compiler.version},{target},{variants}"', "-c", ]