From 85ebb0ebacf963baa35c2dc2c152cb0f905db91a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 27 Feb 2012 23:18:26 +0100 Subject: [PATCH] [entropy.const] rework ETP_ARCH_CONST and keywords configuration, make it work with overridden values --- lib/entropy/const.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/entropy/const.py b/lib/entropy/const.py index 2bc5c831c..137447a70 100644 --- a/lib/entropy/const.py +++ b/lib/entropy/const.py @@ -133,15 +133,15 @@ if ETP_ARCH_CONST is None: break _more_keywords = None -if ETP_ARCH_CONST is None: - if _uname_m.startswith("arm"): - # ARM is "special", multiple subarches - # ahead, better use the full uname value - # and account "arm" to etpSys['keywords'] +if _uname_m.startswith("arm"): + # ARM is "special", multiple subarches + # ahead, better use the full uname value + # and account "arm" to etpSys['keywords'] + if ETP_ARCH_CONST is None: ETP_ARCH_CONST = _uname_m - _more_keywords = set(["arm", "~arm"]) - else: - ETP_ARCH_CONST = "UNKNOWN" + _more_keywords = set(["arm", "~arm"]) +elif ETP_ARCH_CONST is None: + ETP_ARCH_CONST = "UNKNOWN" etpSys = { 'archs': ['alpha', 'amd64', 'amd64-fbsd', 'arm', 'hppa', 'ia64', 'm68k',