From nobody Sun Apr 28 23:57:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60997+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60997+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1591743865; cv=none; d=zohomail.com; s=zohoarc; b=in0cyAUXolAN9n9lCYoJdR0nEhYSCSR07VGuZ6OjhBOYLFBQkkCAXeaow1WWMjjriOogEL3bJTAc/sK/vpS+97SZlW8UIz6/wQiN4VHDP+pteKFFVzVfzXcnk28vrX1DmINC0G4aJY3MrqhSW3aTW0o482ZfRhoBFVTo2RFg2gQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591743865; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Ti6CEFzZlRAPcNbM7JauCz0ifglPr5V+l7Yngym7dU4=; b=YjJdvboLWzZqX1C9lsnm5+fxjMEvxbbsUC/ztfeo2PuJT6EN1SQVmifBH+hWgAsHiNhRptjTpEuyHc+eu3l5XtNUBNyFVAxRAUBGszgvMcsRiQWGRHdP6XE5Qr8HPd2yE0HvjVuMR122mlFmDl93VCM0lVgWVrUoEERQTuTkUmg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60997+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1591743865770588.5307032491015; Tue, 9 Jun 2020 16:04:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cBQMYY1788612xiRCsTF0amY; Tue, 09 Jun 2020 16:04:25 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1142.1591743861278530599 for ; Tue, 09 Jun 2020 16:04:24 -0700 IronPort-SDR: FLZ89B71nv5fAv0ADjZIWPlCZ8x6RcdK+wrTkSfvK/8ay85dQoJDcjSVDS9z2+lZIlu//2079y Ui4U3QN1nkPw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 16:04:24 -0700 IronPort-SDR: NG0OQaJlKNZgT4pG8Fz1NmB5f97k/l+zjUjZoeJisLUg+rBMk5+QZkgTGXFLQGYE6QG2HxdCMa fyqpzLi03Pqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,493,1583222400"; d="scan'208";a="473223587" X-Received: from sfp-ecbjorge.amr.corp.intel.com ([10.165.41.176]) by fmsmga005.fm.intel.com with ESMTP; 09 Jun 2020 16:04:24 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Ashley E Desimone , Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when removing submodules Date: Tue, 9 Jun 2020 16:04:05 -0700 Message-Id: <2fc6277c477b2ce69f4d130dbdc68dc3f514ee94.1591743203.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: oZTXyfD7qJjsTWWCARaL2Eulx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591743865; bh=k2eY1GX3y7erAuD9Dxx0xZ0HbpS05FK1Lao3TjtT5Ws=; h=Cc:Date:From:Reply-To:Subject:To; b=Y4DPgpI8nwnb/v1OAaytS5qbWmlccR+g+w8O5x/+7KO26qpTs3YA2pCruAR5ArrCyuk F/HN2glOPoXJL9/8HBfA/Yx0vJ7TWlptyHHjx0wrfFhp55dL+8GPzgItOoU6xKNsV+PHD 66RHdiNTXlmZq1l4Nrj6iDRFskC9vbfTJiI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Submodules may generate un-tracked or modify files in the repo. when removing the submodule do so even with modifications. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge Reviewed-by: Ashley DeSimone --- project_utils/submodule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project_utils/submodule.py b/project_utils/submodule.py index 170629b..3d1b620 100644 --- a/project_utils/submodule.py +++ b/project_utils/submodule.py @@ -48,14 +48,14 @@ def _deinit(repo, submodules=3DNone, verbose=3DFalse): verbose - Enable verbose messages """ if submodules is None: - output_data =3D repo.git.execute(['git', 'submodule', 'deinit', '-= -all'], + output_data =3D repo.git.execute(['git', 'submodule', 'deinit', '-= f', '--all'], with_extended_output=3DTrue, with_s= tdout=3DTrue) display_git_output(output_data, verbose) else: for sub in submodules: if verbose: print(strings.SUBMOD_DEINIT_PATH.format(sub.path)) - output_data =3D repo.git.execute(['git', 'submodule', 'deinit'= , '--', sub.path], + output_data =3D repo.git.execute(['git', 'submodule', 'deinit'= , '-f', '--', sub.path], with_extended_output=3DTrue, wi= th_stdout=3DTrue) display_git_output(output_data, verbose) return -- 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60997): https://edk2.groups.io/g/devel/message/60997 Mute This Topic: https://groups.io/mt/74786169/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sun Apr 28 23:57:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60998+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60998+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1591743870; cv=none; d=zohomail.com; s=zohoarc; b=FmqGLtP94NCHVH3Bdngtj9XBhFygrJQ/yxVE5D5pTdV/axAlk1LGFSXQdc8aIwUlfWTsd8h/9AvU6M3vzZs/9Ikt4N80nQj70MXK84TiOQrj31A/T4vY9cyOvIKVYVRJeyxTRuJsM6zv6ccj0UGuVL8DIqiYlvYmIw6B+maQS2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591743870; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=tQ/2beqy190vYOyYN4ySZ0hqYQbQV+lLgY7iyM+o4i0=; b=ORUIJfXuCUA5ykVDKDSAR36l5+tk+Wf5FK8GszLqkuVKGNN85NtP1fkHT6r7E3r587YpgTa6tzGgll8Vl7yUXMPfZQJCsIIRFgkL7DNuTiew1bRQ0zp6HQhzh2nuuaUvd1KaXG1E6OmbItj0pArpa/JD9BJyo9KLkvjajh6/mD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60998+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15917438707411.1521969772663851; Tue, 9 Jun 2020 16:04:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Wk3YYY1788612x8xIYyM7uWV; Tue, 09 Jun 2020 16:04:30 -0700 X-Received: from mga14.intel.com (mga14.intel.com []) by mx.groups.io with SMTP id smtpd.web10.1142.1591743861278530599 for ; Tue, 09 Jun 2020 16:04:29 -0700 IronPort-SDR: sWUlMR8/MjWVIZPxJ2vY8YMLUDMLXtKmXuhLOmpz1QlS4wq3o/Wr0VxULvE/LaRONcuMDqnlr/ +VaJfbCgGl2Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 16:04:29 -0700 IronPort-SDR: 2lfX/iKXwB7pJIOFueV68OqAc+fRNxqfQWzfHvmUYoGzvyZtG8YITQ65omBvkQDISHsTCnI2iH 9tEkLUOaVySg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,493,1583222400"; d="scan'208";a="473223598" X-Received: from sfp-ecbjorge.amr.corp.intel.com ([10.165.41.176]) by fmsmga005.fm.intel.com with ESMTP; 09 Jun 2020 16:04:29 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Ashley E Desimone , Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Adding backwards compatibility for old pin files Date: Tue, 9 Jun 2020 16:04:06 -0700 Message-Id: <8f672799cb0b3471d68146a351ec20b441e34ce8.1591743203.git.erik.c.bjorge@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,erik.c.bjorge@intel.com X-Gm-Message-State: q8sZuHx7Y1ENMfyh46F7OrWEx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1591743870; bh=ICMck9+LqcsD/mXNn/Yup+CagKLNYL+e/3N/GtV4NH4=; h=Cc:Date:From:Reply-To:Subject:To; b=ceevgzv4ie2Px4EW07StWkdNFpV6WC7xQQjffGyNPtP6E2eQSFy//t4ctnS6YMSbqjV ZX2kh0qtTzno4PqNloX3wXMTU9aPJZtrnUMalzbyNk0h7GPQc9kYKGNyx/1KNBKRYQ/34 yaL+c2nY8k+NzLJ9yDhgG5FWX6TDYn6f+h0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Older pin files used the invalid enable_submodule attribute. This has been fixed for new pin files but we need to be able to support older pin files as well. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge Reviewed-by: Ashley DeSimone --- edkrepo_manifest_parser/edk_manifest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/edkrepo_manifest_parser/edk_manifest.py b/edkrepo_manifest_par= ser/edk_manifest.py index adf6d52..00ad392 100644 --- a/edkrepo_manifest_parser/edk_manifest.py +++ b/edkrepo_manifest_parser/edk_manifest.py @@ -795,7 +795,11 @@ class _RepoSource(): # If enableSubmodule is not set to True then default to False self.enableSub =3D (element.attrib['enableSubmodule'].lower() = =3D=3D 'true') except Exception: - self.enableSub =3D False + try: + # Adding backwards compatibility with pin files that used = incorrect attribute + self.enableSub =3D (element.attrib['enable_submodule'].low= er() =3D=3D 'true') + except Exception: + self.enableSub =3D False if self.branch is None and self.commit is None and self.tag is Non= e: raise KeyError(ATTRIBUTE_MISSING_ERROR) -- 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60998): https://edk2.groups.io/g/devel/message/60998 Mute This Topic: https://groups.io/mt/74786172/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-