From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=15.241.140.78; helo=g4t3425.houston.hpe.com; envelope-from=derek.lin2@hpe.com; receiver=edk2-devel@lists.01.org Received: from g4t3425.houston.hpe.com (g4t3425.houston.hpe.com [15.241.140.78]) (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 0492E203B858C for ; Wed, 9 May 2018 00:50:02 -0700 (PDT) Received: from G4W9120.americas.hpqcorp.net (g4w9120.houston.hp.com [16.210.21.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3425.houston.hpe.com (Postfix) with ESMTPS id 7296EB8 for ; Wed, 9 May 2018 07:50:01 +0000 (UTC) Received: from G9W8454.americas.hpqcorp.net (2002:10d8:a104::10d8:a104) by G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Wed, 9 May 2018 07:49:53 +0000 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (15.241.52.10) by G9W8454.americas.hpqcorp.net (16.216.161.4) with Microsoft SMTP Server (TLS) id 15.0.1178.4 via Frontend Transport; Wed, 9 May 2018 07:49:53 +0000 Received: from CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM (10.169.15.11) by CS1PR8401MB1223.NAMPRD84.PROD.OUTLOOK.COM (10.169.97.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Wed, 9 May 2018 07:49:51 +0000 Received: from CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a04f:e190:f2e7:d258]) by CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM ([fe80::a04f:e190:f2e7:d258%15]) with mapi id 15.20.0735.019; Wed, 9 May 2018 07:49:51 +0000 From: "Lin, Derek (HPS UEFI Dev)" To: "edk2-devel@lists.01.org" CC: "yonghong.zhu@intel.com" , "Lin, Derek (HPS UEFI Dev)" Thread-Topic: [PATCH] BaseTools: Fix python error with --genfds-multi-thread. Thread-Index: AQHT52jZm6heLFfZM0+Rss79mtmlzqQnBa2Q Date: Wed, 9 May 2018 07:49:51 +0000 Message-ID: References: <20180509073901.15208-1-derek.lin2@hpe.com> In-Reply-To: <20180509073901.15208-1-derek.lin2@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=derek.lin2@hpe.com; x-originating-ip: [16.242.247.137] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; CS1PR8401MB1223; 7:iPwiBZthG3yS3LNrafqgG7wk6aicokG53JW3Xdk0OqoYwNAQiYYi6VP2MO3rNp/HC5aiwlMbVxX82jgIj3vshydQzEcFDOt8PL4S5BIM/YCf/jjdiYJPTwvy5D+h0egmJ6iyr1YCFJaw9VECHo9OneVz+0JK+Dps57CyO2GGlTiAKYymLVUsJWF3tx2CqHW9F9eN1qM5vOcFxSLF2K7dP/j1ezR7qK7p7dqFqc8sfJjibDAHIsjjt2/mhpnjnnH3 x-ms-exchange-antispam-srfa-diagnostics: SOS;SOR; x-forefront-antispam-report: SFV:SKI; SCL:-1; SFV:NSPM; SFS:(10019020)(396003)(39380400002)(346002)(39860400002)(376002)(366004)(189003)(199004)(2906002)(99286004)(478600001)(305945005)(55016002)(5250100002)(5640700003)(316002)(6506007)(97736004)(7736002)(8936002)(3660700001)(53936002)(54906003)(3280700002)(476003)(6116002)(4326008)(575784001)(486006)(81166006)(81156014)(8676002)(86362001)(446003)(11346002)(3846002)(26005)(6436002)(186003)(102836004)(33656002)(66066001)(5660300001)(74316002)(106356001)(105586002)(7696005)(25786009)(1857600001)(53546011)(2900100001)(2501003)(76176011)(9686003)(2351001)(68736007)(6916009)(14454004); DIR:OUT; SFP:1102; SCL:1; SRVR:CS1PR8401MB1223; H:CS1PR8401MB0678.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:(222181515654134); BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989080)(4534165)(4627221)(201703031133081)(201702281549075)(8990040)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:CS1PR8401MB1223; x-ms-traffictypediagnostic: CS1PR8401MB1223: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(227479698468861)(222181515654134); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:CS1PR8401MB1223; BCL:0; PCL:0; RULEID:; SRVR:CS1PR8401MB1223; x-forefront-prvs: 0667289FF8 received-spf: None (protection.outlook.com: hpe.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: jnw1H9vxXII/kOKx2BfFPO9cvN5COXRJ5ZI8gH6sZtQIGMgqCuOnd6ASgkS4GXCAKfgTjT4Wo+nQSG/FxTIJndHV66L8N/0CSQIR8ttkwi0TSJ72qToIFPFUQcivPyaKyRfqAvCQSIcf5I1tS7Zpt3dwcBWwHJPgxhL80YbkD+54jyhHxW0mGPm9uVPEynUT spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 63bf520e-108d-46b6-f130-08d5b5817254 X-MS-Exchange-CrossTenant-Network-Message-Id: 63bf520e-108d-46b6-f130-08d5b5817254 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 May 2018 07:49:51.5433 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR8401MB1223 X-OriginatorOrg: hpe.com Subject: [PATCH] BaseTools: Fix python error with --genfds-multi-thread. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 07:50:02 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Lin, Derek (HPS UEFI Dev)=20 Sent: Wednesday, May 9, 2018 3:39 PM To: Lin, Derek (HPS UEFI Dev) Subject: [PATCH] BaseTools: Fix python error with --genfds-multi-thread. When self.Alignment is None, it ran into python error since there is no str= ip() in None. --- BaseTools/Source/Python/GenFds/GuidSection.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Sour= ce/Python/GenFds/GuidSection.py index 1105689e0d..6cadff0bd2 100644 --- a/BaseTools/Source/Python/GenFds/GuidSection.py +++ b/BaseTools/Source/Python/GenFds/GuidSection.py @@ -2,7 +2,7 @@ # process GUIDed section generation # # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
= -# +# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.
# This program and the accompanying materials # are licensed and made a= vailable under the terms and conditions of the BSD License # which accomp= anies this distribution. The full text of the license may be found at @@ -= 273,7 +273,7 @@ class GuidSection(GuidSectionClassObject) : self.Alignment =3D None self.IncludeFvSection =3D False self.ProcessRequired =3D "TRUE" - if IsMakefile and self.Alignment.strip() =3D=3D '0': + if IsMakefile and self.Alignment is not None and self.Alignmen= t.strip() =3D=3D '0': self.Alignment =3D '1' return OutputFileList, self.Alignment =20 -- 2.15.1.windows.2