From efb671e94fdab12d95e304317ab9bd4547178679 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 30 May 2017 13:52:08 -0400 Subject: [PATCH] Use anaconda-core to detect buildarch For historical reasons, lorax used the 'anaconda' package as a touchstone to determine the architecture for the build. At some point, this package became a metapackage that pulls in both the GUI and headless installers. In the modular world, it's possible that only the core and TUI bits may be available for use. The only subpackage of anaconda that is guaranteed to be on any viable system is anaconda-core, so let's switch to using that for the touchstone instead of the metapackage. Signed-off-by: Stephen Gallagher (cherry picked from commit 2c3007beb835ce34f903cbbdb9777485dad946c5) --- src/pylorax/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py index aafd0c95..5f4304bd 100644 --- a/src/pylorax/__init__.py +++ b/src/pylorax/__init__.py @@ -371,12 +371,12 @@ def get_buildarch(dbo): buildarch = None q = dbo.sack.query() a = q.available() - for anaconda in a.filter(name="anaconda"): + for anaconda in a.filter(name="anaconda-core"): if anaconda.arch != "src": buildarch = anaconda.arch break if not buildarch: - logger.critical("no anaconda package in the repository") + logger.critical("no anaconda-core package in the repository") sys.exit(1) return buildarch