From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.1792.1595462033633287272 for ; Wed, 22 Jul 2020 16:53:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=irRLKn3o; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: X2ix+Fx2EuUYfOdJEwjt2mBzEgicouDCGG3ozr2dOLpOK5lcGj2an4y8xr/scrvgYicyysnl5z WkprvBusr0GA== X-IronPort-AV: E=McAfee;i="6000,8403,9690"; a="149618087" X-IronPort-AV: E=Sophos;i="5.75,383,1589266800"; d="scan'208";a="149618087" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2020 16:53:52 -0700 IronPort-SDR: 3virK/KyEgibLU1YBxykc1fydz3o4wruo10+HPeOqpFIG7Fbqvu3ssTvnB9+DEFn3VwH/MRuiF sRXY2Uv0n9Dg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,383,1589266800"; d="scan'208";a="462642270" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga005.jf.intel.com with ESMTP; 22 Jul 2020 16:53:52 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 22 Jul 2020 16:53:51 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 22 Jul 2020 16:53:51 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.173) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 22 Jul 2020 16:53:48 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8dMvF+Lb1YYxSzZtKD0ay38enbTEHj6R+eJlJVHjEL+nBxHoVB2MkozVK4dY/TPFgzRGk8WdWkt4IVMx2bCiuGniOY8WnhawAYfCU7wC95UJLpsjVahP8loYnq7NCLfYEuq4vGXZXV2p7cQEIBj3RYmsN/Ui0V8y2nt3ztkQfoGnlOKCYmG8niiUa7gdjqcPujKdpN4ucuoOg7Xi3ZsEzFf9SZ+bjffvi3/jT5PwCdTvX6lLUJhVlxf4gPFFwtZXv0dzEg0iLNCxijQAorTqOAge66fD/4LXBTEZyOCuX4slaTvlDTGSjMKhBoOqYCyG2avCIYDoGx+ThOHffH89A== 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=hY/1yiDANF/vOfpQAI6NnR6wH012198WxX9Pf/gt9yQ=; b=ZVaYG+9F86LneaTo+EujXheyGdo9tpeKgipArOal7Ibnmx5S6c5OVRMSIsI1L8TVKgUspdX8VKOE5K6U92C5xva3WK6gQx5DSPk3ypADPnqtGpCsm2qB5BHcvYxwmppmEeFiaa2zVZowwQrUWpqoipJJ+uyeVZ8VqWKzp778wTNtWSXo6wopM3bH0D49A8wrNY9JvWdXYRz1tNUTwreR7SFm0El4rQ9U3mKYGCPZ4vq3cIofX4vRYHmHrgnSVwyq4txSMN2N5/uafmIn8YTL/Aa5g05yq+CKMPg3NxQmT1YMS26Eehsygzr3HKa3sE6OD2kEPTEn5KsNPyRq5atAbQ== 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=hY/1yiDANF/vOfpQAI6NnR6wH012198WxX9Pf/gt9yQ=; b=irRLKn3oXbe2VPHsQuZkhvyyGWAfubZsoeTNxE2xQ3pfkits8yaEfLFlgXg6xkEva5dA7YjEf4Vxw5X4dTW4UpI7Feiy0jaNcKg6XFBFoILUFK9WkyGrWzYl4XROJ58AdKR/ezqpvBqxmRwB7tzBTiKRd2s3B3PjdNnOHzmvgOY= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BYAPR11MB3623.namprd11.prod.outlook.com (2603:10b6:a03:b5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.23; Wed, 22 Jul 2020 23:53:47 +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.3216.021; Wed, 22 Jul 2020 23:53:47 +0000 From: "Ashley E Desimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Continue checkout on submodule deinit errors Thread-Topic: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Continue checkout on submodule deinit errors Thread-Index: AQHWYFWp7gVowbxrtUWTMz9N06a6CakURfhA Date: Wed, 22 Jul 2020 23:53:47 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fd883346-bbe8-4423-e37a-08d82e9a79c9 x-ms-traffictypediagnostic: BYAPR11MB3623: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:651; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9Sg19nw08Yg0e0KqbfqWvniKIVxMvwhLZJfU2MqXBwaOapqRnP/lEtGQRa5UZuro6oKdP73QgRQHDBMtV3XMvQyS00FZK8uKCpDTV2sSUfZ8fEFLDDdsRIYCTJjEUpNIcVsM3cHSoTMAI6j2jWB4ip8EQJngcGI2aR+dfpLPlVNY1lUzxYlKmIhGfOz/HDDAFqssRZbAz4MvU3nyL44Re9biK3P8WZ5liF8K+aHGws2VAlEDVX5TT/u4hQoCBYbcX2sB7w3XE4pDc7NUDiex40U7Y3SdWh7YrAQTobGzL1flMxDN1wLc8jHSvcXhcw1eYm1A1ftdDakiTG82c/CdMQ== 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)(376002)(136003)(346002)(39860400002)(396003)(366004)(8936002)(8676002)(478600001)(64756008)(66476007)(66946007)(66556008)(86362001)(76116006)(66446008)(71200400001)(83380400001)(4326008)(53546011)(5660300002)(9686003)(7696005)(2906002)(110136005)(55016002)(316002)(54906003)(6506007)(26005)(33656002)(186003)(107886003)(52536014);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: qi9tJPu7UCKeKvuvRBcZtLLt90uvtX3f2kiUy+zovZv2oOAn9+O2av4pOckTfs3J2eDYsODb5H8QLgMLlVePS6yolAbMte5mLhbyKMD6csmqW6/9IYgQvP9qtlQw194GzfZg7LQOt8ng28XnGjIlOWJH1k2B9l/7KafEeKRHELpbixR1kgXlMMvQGFsLIF68SXxVVTnNynZ21038KR3kz4+bJoDuPGjrBqXBhp4mNu62pgPjErXIQvVnMP26V+T5vIRypg/ahO2qKSbXsEL5BG6fWuO3iu/xwUxlgbueYQWXrFgsao4ofpGsCGUredbmjBO5PZ/MWtj+srXT9wtknso0oEGMWcWW/kaMAEo+DzlvJGltud15qJs56It4lI1XthHLfGgg+r2aYW1C9DrTbdgHv+QnWzUkRo7ovBbS4OTn8QP3j/XTAcbR0C3LSLp+AM9kagrQpgln36EtQ2nixu/Zeq0/+Ez7/g/oB+7BqRvXyYY/NN+w4h/3+Px4DnKx MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3973.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd883346-bbe8-4423-e37a-08d82e9a79c9 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jul 2020 23:53:47.4121 (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: 90jlesW0Q7OaVzR5bCVAe/UgtsENJ2VDhEeaSWGxv7XeXo5tf8txlKZLkfsUdQ5Siy9PYbYliPyjH0xIqwR1eU1uTj3fviBNesP7zd4CsQQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3623 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 Reviewed-by: Ashley DeSimone -----Original Message----- From: Bjorge, Erik C =20 Sent: Wednesday, July 22, 2020 11:26 AM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v1] EdkRepo: Continue checkout on su= bmodule deinit errors In some cases submodules may still not be deinitialzied even with the more = aggressive deinit flags. In these cases the checkout will report a warning= and attempt to continue the checkout process. 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 | 9 +++++++-- edkrepo/common/com= mon_repo_functions.py | 8 +++++++- edkrepo/common/humble.py | 3 +++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/edkrepo/commands/checkout_pin_command.py b/edkrepo/commands/ch= eckout_pin_command.py index 39c5aeb..1c58113 100644 --- a/edkrepo/commands/checkout_pin_command.py +++ b/edkrepo/commands/checkout_pin_command.py @@ -16,7 +16,7 @@ import edkrepo.commands.arguments.checkout_pin_args as ar= guments import edkrepo.commands.humble.checkout_pin_humble as humble from= edkrepo.common.common_repo_functions import sparse_checkout_enabled, reset= _sparse_checkout, sparse_checkout from edkrepo.common.common_repo_function= s import check_dirty_repos, checkout_repos, combinations_in_manifest -from = edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET +from edkrepo.common.humble import SPARSE_CHECKOUT, SPARSE_RESET,=20 +SUBMODULE_DEINIT_FAILED from edkrepo.common.edkrepo_exception import EdkrepoInvalidParametersExcep= tion, EdkrepoProjectMismatchException from edkrepo.common.workspace_mainte= nance.manifest_repos_maintenance import list_available_manifest_repos from= edkrepo.common.workspace_maintenance.manifest_repos_maintenance import fin= d_source_manifest_repo @@ -71,7 +71,12 @@ class CheckoutPinCommand(EdkrepoC= ommand): print(SPARSE_RESET) reset_sparse_checkout(workspace_path, manifest_sources) submodule_combo =3D pin.general_config.current_combo - deinit_full(workspace_path, manifest, args.verbose) + try: + deinit_full(workspace_path, manifest, args.verbose) + except Exception as e: + print(SUBMODULE_DEINIT_FAILED) + if args.verbose: + print(e) pin_repo_sources =3D pin.get_repo_sources(pin.general_config.curre= nt_combo) try: checkout_repos(args.verbose, args.override, pin_repo_sources, = workspace_path, manifest) diff --git a/edkrepo/common/common_repo_functions= .py b/edkrepo/common/common_repo_functions.py index 313a1ca..a6a38cf 100644 --- a/edkrepo/common/common_repo_functions.py +++ b/edkrepo/common/common_repo_functions.py @@ -50,6 +50,7 @@ from edkrepo.common.humble import INCLUDED_URL_LINE, INCL= UDED_INSTEAD_OF_LINE, I from edkrepo.common.humble import ERROR_WRITING_IN= CLUDE, MULTIPLE_SOURCE_ATTRIBUTES_SPECIFIED from edkrepo.common.humble import VERIFY_GLOBAL, VERIFY_ARCHIVED, VERIFY_P= ROJ, VERIFY_PROJ_FAIL from edkrepo.common.humble import VERIFY_PROJ_NOT_IN= _INDEX, VERIFY_GLOBAL_FAIL +from edkrepo.common.humble import SUBMODULE_DEINIT_FAILED from edkrepo.common.pathfix import get_actual_path from project_utils.spa= rse import BuildInfo, process_sparse_checkout from edkrepo.config.config_f= actory import get_workspace_path @@ -523,7 +524,12 @@ def checkout(combinat= ion_or_sha, verbose=3DFalse, override=3DFalse, log=3DNone): # Deinit all submodules due to the potential for issues when switching # branches. if combo_or_sha !=3D manifest.general_config.current_combo: - deinit_full(workspace_path, manifest, verbose) + try: + deinit_full(workspace_path, manifest, verbose) + except Exception as e: + print(SUBMODULE_DEINIT_FAILED) + if verbose: + print(e) =20 print(CHECKING_OUT_COMBO.format(combo_or_sha)) =20 diff --git a/edkrepo/common/humble.py b/edkrepo/common/humble.py index f905= 357..763b9a6 100644 --- a/edkrepo/common/humble.py +++ b/edkrepo/common/humble.py @@ -155,3 +155,6 @@ BRANCH =3D ' Branch : {0}' COMMIT =3D ' Commit Id: {0}' WRITING_PIN_FILE =3D 'Writing pin file to {0} ...' COMMIT_MESSAGE =3D 'Pin file for project: {0} \nPin Description: {1}' + +# Common submodule error messages +SUBMODULE_DEINIT_FAILED =3D 'Warning: Unable to remove all submodule conte= nt' -- 2.21.0.windows.1