From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 D35C42094502E for ; Wed, 5 Apr 2017 17:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491439912; x=1522975912; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=Bh6mJu2ECik11g8owRSvfhk1lW6LmIrYsQJuRP70b4w=; b=JvuMxtnqtLyaBwm2/oUB7m/gcfLL95SIrqKQJ7qNU/CJyXr2N3yaQ1Rh 7vhLg0N3R58f2C84TnEj+WrQoy9yIA==; Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 17:51:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,281,1488873600"; d="scan'208";a="842446090" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2017 17:51:52 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 5 Apr 2017 17:51:52 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 5 Apr 2017 17:51:46 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.246]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.117]) with mapi id 14.03.0319.002; Thu, 6 Apr 2017 08:51:44 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: update error message for SKUID_IDENTIFIER format Thread-Index: AQHSqq0cjGqZpsH6/kehCDb1fOYnkqG3iozQ Date: Thu, 6 Apr 2017 00:51:43 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14D718CA8@shsmsx102.ccr.corp.intel.com> References: <1491026351-54260-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1491026351-54260-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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: , X-List-Received-Date: Thu, 06 Apr 2017 00:51:53 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Zhu, Yonghong > Sent: Saturday, April 1, 2017 1:59 PM > To: edk2-devel@lists.01.org > Cc: Gao, Liming > Subject: [Patch] BaseTools: update error message for SKUID_IDENTIFIER for= mat >=20 > Per DSC spec, the SkuUiName use '|' as separator, so this patch update > the error message to use '|' but not space as separator. >=20 > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/Common/Misc.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Py= thon/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: > self.SkuIdNumberSet =3D [SkuIds[k].strip() + 'U' for k i= n self.SkuIdSet] > 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 an= d 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= the platform. [Valid SKU-ID: %s]" > - % (each, " ".join(SkuIds.keys()))) > + % (each, " | ".join(SkuIds.keys())= )) >=20 > def __SkuUsageType(self): >=20 > if len(self.SkuIdSet) =3D=3D 1: > if self.SkuIdSet[0] =3D=3D 'DEFAULT': > -- > 2.6.1.windows.1