From nobody Sat May 4 18:44:22 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1491026358919811.8983709260253; Fri, 31 Mar 2017 22:59:18 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EEB7221A0482F; Fri, 31 Mar 2017 22:59:16 -0700 (PDT) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A2F7E21A04820 for ; Fri, 31 Mar 2017 22:59:15 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Mar 2017 22:59:15 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga003.jf.intel.com with ESMTP; 31 Mar 2017 22:59:12 -0700 X-Original-To: edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491026355; x=1522562355; h=from:to:cc:subject:date:message-id; bh=Peu7oj99AjPCRw6lv3PY8/gtfH2ZYvtFFTKiZhSPN2s=; b=J2GNbvGiGlG5NHxTmJdfxkJigK0phnYwamTkTvAA5szG3QbXHF15ogHF 2RQVysLeSC5deLfbMmq9ffw2H8EYCA==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,256,1486454400"; d="scan'208";a="950460297" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Sat, 1 Apr 2017 13:59:11 +0800 Message-Id: <1491026351-54260-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [edk2] [Patch] BaseTools: update error message for SKUID_IDENTIFIER format X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Per DSC spec, the SkuUiName use '|' as separator, so this patch update the error message to use '|' but not space as separator. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/Common/Misc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Pyth= on/Common/Misc.py index 1a5968a..390ef36 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -2004,21 +2004,21 @@ class SkuClass(): try:=20 self.SkuIdNumberSet =3D [SkuIds[k].strip() + 'U' for k in = self.SkuIdSet] =20 except Exception: EdkLogger.error("build", PARAMETER_INVALID, ExtraData =3D "SKU-ID [%s] is not supported by= the platform. [Valid SKU-ID: %s]" - % (k, " ".join(SkuIds.keys()))) + % (k, " | ".join(SkuIds.keys()))) if len(self.SkuIdSet) =3D=3D 2 and 'DEFAULT' in self.SkuIdSet and = SkuIdentifier !=3D 'ALL': self.SkuIdSet.remove('DEFAULT') self.SkuIdNumberSet.remove('0U') for each in self.SkuIdSet: if each in SkuIds: self.AvailableSkuIds[each] =3D SkuIds[each] else: EdkLogger.error("build", PARAMETER_INVALID, ExtraData=3D"SKU-ID [%s] is not supported by t= he platform. [Valid SKU-ID: %s]" - % (each, " ".join(SkuIds.keys()))) + % (each, " | ".join(SkuIds.keys()))) =20 def __SkuUsageType(self):=20 =20 if len(self.SkuIdSet) =3D=3D 1: if self.SkuIdSet[0] =3D=3D 'DEFAULT': --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel