From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.70798.1600114864868713497 for ; Mon, 14 Sep 2020 13:21:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=uMoNiO+m; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: hmGbc19LYEz13jKqq3zXhFEp7PAMzaBomPBYgNHxUTE/rswf35RVHFV5SVRwb3Yzn7Y865B9AX tcSjdEM1Fb9Q== X-IronPort-AV: E=McAfee;i="6000,8403,9744"; a="223340443" X-IronPort-AV: E=Sophos;i="5.76,427,1592895600"; d="scan'208";a="223340443" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 13:21:04 -0700 IronPort-SDR: GaAx+2DAA3LBbTDCuTIXpZmB+azjEHDtDcxOUUDPdWZbjntR/zjwOJrGky/xxy0MskrQ8Cvt8y /cNsAU9DGBhg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,427,1592895600"; d="scan'208";a="482483737" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga005.jf.intel.com with ESMTP; 14 Sep 2020 13:21:04 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) 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; Mon, 14 Sep 2020 13:21:03 -0700 Received: from orsmsx151.amr.corp.intel.com (10.22.226.38) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 14 Sep 2020 13:21:03 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by ORSMSX151.amr.corp.intel.com (10.22.226.38) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 14 Sep 2020 13:21:03 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.172) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 14 Sep 2020 13:21:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KcSO0Y6qOc6cSlAMiVQcUpYdS33+NHar3/XlvmJxIfBNn1JxLxbnyaxxbqhFM5/SPdRBYKG0iK/hAVQmCugBdUrKSB9khcpMhrad5TlWHdaTIspGred2o0NuHyStMJXpqSpsDlqeRZI4j8+AfsA/fjQgiiMH0CJVYjQsPx3IioJ/2j2QXXaa0w+kn8gfqd87MpopCOyjXeNOE5xpi9uOMVWhwR0K2ER27FDj4iRpUdqb0xBoAo+7n2ZOVmQ69y/sgcWE53tESe9G/fzRgZsQNF3qR5yrNJ2v3yXg9cw+hcFJcYF4cRKSS+MsVJQLKdra7Ki2G5PIqpcvhlrmdxC1NA== 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=pAZJgN6f5oi0r2aJLY0wSXWd/LIRGSWgEBtI2bqqW8M=; b=S99lYa9w6FxllilaQaBRN0do1MU0SdjeMgrGeR9mgSqAHTlSKoR2agBsaEkphvSl8ldyJ/d5bFWXLL6Ohpi1/0y8WXBOlStyaQNwG4xlOf4MS+N7vkF8ZmKk4Srdo9I1ZqBxNEv6Afjg5syjOZlYQkNHgHbdOHEoZv2UMD2qDUrPvVoOaeJTAsBzvzLuuPv1AuHYj6Ke4dfv8mOq6lQSaZmwp8EDnlhBs6/t/iR9bDpMDhMTKl9X7PPOE4hNY7QOUiNT2LZnYMs6CiyecTftOImM90UcntFGkHfydZoWx1a1G6jxdP/ZdG+Xs7zxISPmWxiBmrlhp7goFpvq95zAhg== 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=pAZJgN6f5oi0r2aJLY0wSXWd/LIRGSWgEBtI2bqqW8M=; b=uMoNiO+mmUZICRAn8vxP9lrmZmoqOEPg45x25lGH+epoEuxKseeM8nSa/C29XsgmA03x7hywpOOAPu7s8Wp2EAhAKcdLBbSvsSOMzdVVLIGSsV6hi14QZAK5l7JEVMHIHw/gY/LoR/yU/Iavts4F0jzgdvrJoT3y9CuoeyVHWXk= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BYAPR11MB3717.namprd11.prod.outlook.com (2603:10b6:a03:b0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3370.16; Mon, 14 Sep 2020 20:21:01 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::f586:b5a8:4b3d:1e76]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::f586:b5a8:4b3d:1e76%5]) with mapi id 15.20.3370.019; Mon, 14 Sep 2020 20:21:01 +0000 From: "Ashley E Desimone" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" , "Bjorge, Erik C" Subject: Re: [edk2-staging/EdkRepo] [PATCH V1] EdkRepo: edkrepo clone fails when given an archived project name Thread-Topic: [edk2-staging/EdkRepo] [PATCH V1] EdkRepo: edkrepo clone fails when given an archived project name Thread-Index: AQHWiS2MSBEO4uG9ike1ZJEhp6rB0qlolr8w Date: Mon, 14 Sep 2020 20:21:01 +0000 Message-ID: References: <20200912175236.2086-1-nathaniel.l.desimone@intel.com> In-Reply-To: <20200912175236.2086-1-nathaniel.l.desimone@intel.com> 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: f2ea985a-9227-44d4-5bc3-08d858ebb2ec x-ms-traffictypediagnostic: BYAPR11MB3717: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZLvXjkhZitmrRns3Rc1ghBc/ndieyuW5Nye1sOvFPX88T1DcchX0rUVI53e38kXCZQPD9mJA57+SD5nsTK0webPQOAFQgeAuGVqJrRbMKTNQtWccXpTRTs1e4CHYqvCMzoobth2a6T7qtFgdXbm5K1sZIVJfuPTneDHDmIbOspZHEjAeCwTqfUb/z1n+BK62piZocVoypwU3DroSeF9+7JS0mltGKL2jBhVA501IpD5K7Jf4t/FOvT8irlBoaCTa+kmEBIA/8EHWsgicZBeT8s8qU1MVtIZK1aliITSAUXQV+FFvozvniZCC6Qr02UuGfwa8H97oNaMT3JT7lDxO5A== 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;SFS:(4636009)(136003)(39860400002)(376002)(396003)(366004)(346002)(2906002)(316002)(186003)(53546011)(6506007)(7696005)(26005)(4326008)(107886003)(8676002)(55016002)(9686003)(8936002)(71200400001)(5660300002)(86362001)(54906003)(110136005)(478600001)(66556008)(64756008)(33656002)(52536014)(66446008)(76116006)(66476007)(66946007)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: lhAHCSEkaZLuQpD12MnhP0Ym3Jo8kghsVDkRZ/ouX0svqqKMdDm8ufyQs1aXoWB3V+thj2YvEHAHViIh/SNyZmeFy0dPeFbCug2hgHM3n8MiHK72vJhGD7xzS/bbnQMBe+4WztdxMnQk89CTMHwz7SoP/vSFmPS9I86LAeG1mms1wCL56J7AdCHrux/GphveLmuVSVlM30xrkfZxHKSQDOUwfhnYVzlj5O1egA7U5/jB2+jHd4/gCRfvEAtcr5aCfCU+VHsonJ4giqa3QNY4OjsMuIBTN+J84meTuLxOmx5fknHIw1b/Wry0JqBU3hmjH/Sdsx9mR+sEICxvjRiCzYSbv1zeXyUFgYpbHIu0jfxBhmIN0FcwoSncuCkbC7F+Uz0l7jqIaLXSeHTkO1hifx+Si/kcDSfWQKZ1LqmjU2XtQpGWBVa5lVyG/64flg9TvlKyUHSDpUxOKI+bsZAZbTpJI/2JzL1D/8gvSfA7ylNWj43T2vBrG1kAPLmkh2P2mrI/3ZDKOC8Q+a7uXMRueXblJiVYutSuZTE6kf66NoJrBMza/m4lhotB+BTjlZvIP7UnWrOsKpa5N3fdIGoGB04kcHbJ4J+cBnhu+cXsDrMA6HP3INgXR4J5zA6H+mtWYVIBETN2GPf2rJ8g20taQw== 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: f2ea985a-9227-44d4-5bc3-08d858ebb2ec X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2020 20:21:01.3099 (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: yZwsq8z22rb/rcEFHkEKmHpb49ggaWiHKIuJGj5AXY0j/CBKBMRLWWg2zfTgm2T/V4umJpj0W9sDLD5Ja26TzQyI7YuMcEHORdH258gUyio= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3717 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: Nate DeSimone =20 Sent: Saturday, September 12, 2020 10:53 AM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja ; Bret Barkelew ; Agyeman, Prin= ce ; Bjorge, Erik C Subject: [edk2-staging/EdkRepo] [PATCH V1] EdkRepo: edkrepo clone fails whe= n given an archived project name 1. find_project_in_single_index() needs to search archived projects if the = project name was not found in the active projects list 2. In a rare corner case, find_project_in_all_indices() can return to the c= aller without providing any return arguments. Now an exception will be rais= ed. Cc: Ashley E Desimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Nate DeSimone --- .../workspace_maintenance/manifest_repos_maintenance.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/edkrepo/common/workspace_maintenance/manifest_repos_maintenanc= e.py b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py index db41e75..a57815d 100644 --- a/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py +++ b/edkrepo/common/workspace_maintenance/manifest_repos_maintenance.py @@ -148,6 +148,11 @@ def find_project_in_single_index (project, index_file,= manifest_dir): proj_name =3D case_insensitive_single_match(project, index_file.pr= oject_list) except: proj_name =3D None + if proj_name is None: + try: + proj_name =3D case_insensitive_single_match(project, index_fil= e.archived_project_list) + except: + proj_name =3D None if proj_name: ci_index_xml_rel_path =3D os.path.normpath(index_file.get_project_= xml(proj_name)) global_manifest_path =3D os.path.join(manifest_dir, ci_index_xml_r= el_path) @@ -219,6 +224,7 @@ def find_project_in_all_indices (project, edkr= epo_cfg, edkrepo_user_cfg, except_ for dirpath, dirname, filenames in os.walk(edkrepo_user_cf= g.manifest_repo_abs_path(repo)): if project in filenames: return repo, 'edkrepo_user_cfg', os.path.join(dirp= ath, project) + raise=20 + EdkrepoManifestNotFoundException(humble.PROJ_NOT_IN_REPO.format(projec + t)) else: raise EdkrepoManifestNotFoundException(humble.PROJ_NOT_IN_REPO.for= mat(project)) =20 -- 2.27.0.windows.1