From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.841.1592590746500915996 for ; Fri, 19 Jun 2020 11:19:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=lmJciot7; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: smwtvvEupbIEnAVsiQcr8BQTQx4ejGR3E46LQMHy4YDhZIw7jnxqU9XLW+7r2hxjN1YsGMw10P d0Bw+f35x41Q== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="227742331" X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="227742331" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:19:06 -0700 IronPort-SDR: YzsPazIqvGPynHGDEFor4426ioGJ3Aiol16izOdu4UnrT5KStRcw/zXJCmAcaHzsZN66XlrJJ8 +2q82DefjtRA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="274366029" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by orsmga003.jf.intel.com with ESMTP; 19 Jun 2020 11:19:05 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:19:05 -0700 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 19 Jun 2020 11:19:05 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 19 Jun 2020 11:19:05 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (104.47.37.53) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:19:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fmEiXL4jz1gtfcbbpwT1+DtSodb2orRGtFKpzoj8RFahw1hi9jqw/79Z61OePtETXlM04AosoFgHCSVhiEKbR0FZvsC/oph7KtCjAHnITLEmVg76lAm6nmqGpWdxw3CX3eehTNHN5bAZxx38N9vdglL19l9/VHYgaF9rBW6CpFe7Z/QTgvQUdnM0B/SRyTfv6fLx7E5/p0197CiNssObF8RD9UInBSpuqq6USeXLXEO9AffuJ1rVHfqbuWgRMGjpLs1iD2e55AGT3EiVu4rgyrjHjE3hOnL1eAZWHsLAMkSOUmylQnwHIjR9ozEYCUX7HwFUBCWCzHWsIBUdmYP7AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZPY+BlKkBcZY6sjSG7HZjUos2e/nLVceFFLM8nrfrE=; b=n7sk1d6epCbCnaraB1HGsW8ZJud4CHm4iimBKbqMlGEgF4tsWbFCG6OwIWC0+SdUdGN0bJbPiU4NeK++Hu8ni8JpdWbv1H8X/eNF40s3hEsZdw3tgsYoUseI8MNtmTEgucsa4o++gHMe7tiObu38xJPm2xpHTSodi7roV1aqLG8gfEInWt0l1U1Lnu93BUpLNPggrew+hMBY8lhLpiiHlAf7v/oynleDYYNxajR9NtstcPLnRvaG8YUmznug4ojqFO+KfUxBC1ipAbRVow54Ck6R4bseHUb+2568Bxq5CRKSupMHBRZkBZTFV+ilYz8ojBKTI2vfh59fRNwBY/YIMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZPY+BlKkBcZY6sjSG7HZjUos2e/nLVceFFLM8nrfrE=; b=lmJciot7/4k13mxn5jJDH72+CTvic5eT01qnYPKleHfT9Paen27SobA79xQLMety+0emMGwwOmb+iWTfvXVaykQQ4Tozt0cstT7T4DF4T3uZNcVjMMUYoEWBw5r9imhk4aJllaIUfGfuFjIRm52CVJBKKvZgdd+6X3crArgX670= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BY5PR11MB4241.namprd11.prod.outlook.com (2603:10b6:a03:1ca::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Fri, 19 Jun 2020 18:19:03 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733%7]) with mapi id 15.20.3109.021; Fri, 19 Jun 2020 18:19:03 +0000 From: "Ashley E Desimone" To: "devel@edk2.groups.io" , "Bjorge, Erik C" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 3/3] EdkRepo: Fix submodule failures when switching combos. Thread-Topic: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 3/3] EdkRepo: Fix submodule failures when switching combos. Thread-Index: AQHWP3SNK7s+q2vZN0KkiulyLMgUj6jgTTKA Date: Fri, 19 Jun 2020 18:19:03 +0000 Message-ID: References: <3b74e29011f804ef0b9f8da81a6535dc7ea71ae0.1591827056.git.erik.c.bjorge@intel.com> In-Reply-To: <3b74e29011f804ef0b9f8da81a6535dc7ea71ae0.1591827056.git.erik.c.bjorge@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 846dec19-4244-4e8b-fb59-08d8147d3f57 x-ms-traffictypediagnostic: BY5PR11MB4241: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-forefront-prvs: 0439571D1D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mIEYxhtI+fWQHobWqlFHBnhtqJ2F2kJVuJU2D/V05vMB+Ykge2M+g16cXE8vuv8s6zG4iBg65oooVhkaP+2KzdZmv263MJ8YrTI1hVfIOzeh4ZZZ3mb0tKQUHCO3W1RDzi9sAV1kARnElZoSxyiI6iIsyq1UYiKZoR3E8Cp0jFWoXln/2QcKltCaw1gfwTiza+AY5gK7YTNfcUfXc10/78gDsugs5w8hhOaHl3+Mm1DfOgqjoYirfcwHGJFGy0LA3xjUuFnkWz414XZlUyfkIjLHnH7KnOsCohitTkJbuv7sJuTePucPcGBqHMdE0kw9uP3fRT7wo3x6qCDqM+aaL1/vzpy+/WzX2IHMvl9jpMxO6Co+tqn1pIcTmJRXGFJ2hw3yrEX4R4lzOvhrq8TRTA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(366004)(396003)(136003)(376002)(346002)(4326008)(107886003)(966005)(7696005)(478600001)(9686003)(6506007)(53546011)(186003)(26005)(55016002)(316002)(71200400001)(54906003)(110136005)(86362001)(66476007)(8676002)(8936002)(33656002)(83380400001)(5660300002)(6636002)(52536014)(66556008)(64756008)(2906002)(66446008)(66946007)(76116006);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: JxqHRLLCO6cHznf5uVsLwPIdZuwA9Pcn6Y58WaieXQ52bg59eNuO+4cK+89ejAyBsulNza8/Sfu1gN/pFndp4nOoKk00H0oSA4B/TeUIJJGNA+rsBhZHzSp5y/Rf0WczuxyWXbTF7B3d1B9jiXbmvpYPXWnra50TsZq8O696WjqPb8cNJVk3WaqOsYYNIennOPiZtTig2ffqIj9mFQ3WOr0dfObd7i42GvCg2AqnUHyTrIxJb29oqsWbJhkjp6UyD2sf8QmDA/kIx7ALJiqkZXpq7BjVZO1fhGCDSA0IihphYvx93A0ro6y13QeJBtU6NRt0NCwEzarJlK1s+VhNO/i8X/Z3bMC4/x3G5cVj4rqIL1H0k7dzVsfs30zIxVM+Gh4599i0RzZ33U2GCkna5e5oHsskqgo83aGfqOIk+rM9/LVeC96iNgU6O9BXzR+Zc8fQ7kPiUwLN78iIK22lfwMDGagilo+WClg3cf7Zgy3rfXTfqdNHBmL8PX/FqmnY MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 846dec19-4244-4e8b-fb59-08d8147d3f57 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jun 2020 18:19:03.7374 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Z7m9m2cEs+UEzNfYUJHJimLKdCAEqQS0U6/GIyP0RPclRxhLaLOjeD7rDN466JxcRImdU39pcJnI1ss0mAZH/baANVg+q0brfhzzx1eL5xw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR11MB4241 Return-Path: ashley.e.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed as: 2392e3fa84883958822e056ae35f5b4afade5a80 -----Original Message----- From: devel@edk2.groups.io On Behalf Of Bjorge, Erik= C Sent: Wednesday, June 10, 2020 3:14 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 3/3] EdkRepo: Fix su= bmodule failures when switching combos. When switching combinations or checking out pins the submodule information = may change or have modifications that will cause errors. Before changing to a new combination all submodules should be removed. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge --- edkrepo/commands/checkout_pin_command.py | 5 ++--- edkrepo/common/common= _repo_functions.py | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/ch= eckout_pin_command.py index 9d7346a..39c5aeb 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -22,7 +22,7 @@ from edkrepo.common.workspace_maintenance.manifest_repos_= maintenance import list from edkrepo.common.workspace_maintenance.manifest_repos_maintenance impor= t find_source_manifest_repo from edkrepo.config.config_factory import get_w= orkspace_path, get_workspace_manifest from edkrepo_manifest_parser.edk_mani= fest import ManifestXml-from project_utils.submodule import deinit_submodul= es, maintain_submodules+from project_utils.submodule import deinit_full, ma= intain_submodules class CheckoutPinCommand(EdkrepoCommand):@@ -71,8 +71,7= @@ class CheckoutPinCommand(EdkrepoCommand): print(SPARSE_RESET) reset_sparse_checkout(workspac= e_path, manifest_sources) submodule_combo =3D pin.general_config.cu= rrent_combo- deinit_submodules(workspace_path, manifest, manifest.ge= neral_config.current_combo,- pin, submodule_combo,= args.verbose)+ deinit_full(workspace_path, manifest, args.verbose) = pin_repo_sources =3D pin.get_repo_sources(pin.general_config.curren= t_combo) try: checkout_repos(args.verbose, args.overrid= e, pin_repo_sources, workspace_path, manifest)diff --git a/edkrepo/common/c= ommon_repo_functions.py b/edkrepo/common/common_repo_functions.py index 8c79f3d..59c198f 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -68,7 +68,7 @@ from edkrepo_manifest_parser.edk_manifest_validation impo= rt validate_manifestrep from edkrepo_manifest_parser.edk_manifest_validati= on import get_manifest_validation_status from edkrepo_manifest_parser.edk_m= anifest_validation import print_manifest_errors from edkrepo_manifest_parse= r.edk_manifest_validation import validate_manifestfiles-from project_utils.= submodule import deinit_submodules, maintain_submodules+from project_utils.= submodule import deinit_full, maintain_submodules CLEAR_LINE =3D '\x1b[K' = DEFAULT_REMOTE_NAME =3D 'origin'@@ -498,10 +498,6 @@ def checkout(combinati= on_or_sha, verbose=3DFalse, override=3DFalse, log=3DNone): log=3Dlog) initial_repo_sources =3D manifest.get_repo_sources(= manifest.general_config.current_combo) - # Deinit any submodules that ha= ve been removed.- deinit_submodules(workspace_path, manifest, manifest.g= eneral_config.current_combo,- manifest, submodule_comb= o, verbose)- # Disable sparse checkout current_repos =3D initial_re= po_sources sparse_enabled =3D sparse_checkout_enabled(workspace_path, i= nitial_repo_sources)@@ -524,6 +520,11 @@ def checkout(combination_or_sha, v= erbose=3DFalse, override=3DFalse, log=3DNone): print(SPARSE_RESET) reset_sparse_checkout(workspace_path, = current_repos) + # Deinit all submodules due to the potential for issues= when switching+ # branches.+ if combo_or_sha !=3D manifest.general_c= onfig.current_combo:+ deinit_full(workspace_path, manifest, verbose)= + print(CHECKING_OUT_COMBO.format(combo_or_sha)) try:--=20 2.27.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61101): https://edk2.groups.io/g/devel/message/61101 Mute This Topic: https://groups.io/mt/74807390/1860321 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ashley.e.desimone@intel= .com] -=3D-=3D-=3D-=3D-=3D-=3D