From nobody Mon May 6 21:46:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+50599+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+50599+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1573686615; cv=none; d=zoho.com; s=zohoarc; b=ICda+dzwKbJfFxffyiVaBa7NQDpMMPxTSAsXtG+E6QDPhQZ0RNnOKeyhn2LGj3FqoXu1KM27TJzvrsXeTvhkW2Xf9ZL2HmwnK2kaXiVPjTF0ZkVJvp2xl/oxTml5bmzOO+QQqRaHg8CUDzakhzHBI/MvmCqZ8W+LUIaBEjnSkTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573686615; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=+TC0Bg9v2e0U+cbE6tTr9I9INLaid2BZGMwYlHPIe0I=; b=OpINZ5wwA5yILZvbPx44wc3SwvhumXTbclUBFPiaUkEtGE3pUgbF3EtWjFWvjRyZBIsdFp3wnbSOGJ6caaETUujR49Kn3O8ZCfyGh0SW/Pmc/Lrb92uB+gyoCrECUDc+5LS6KwUBzDuIXHhsKXIN/UvCUx4cb1jGy7TAF7wIJNM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+50599+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 1573686615242702.3555747433323; Wed, 13 Nov 2019 15:10:15 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id oLx6YY1788612xBiLXtms2GZ; Wed, 13 Nov 2019 15:10:14 -0800 X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.585.1573686602583134517 for ; Wed, 13 Nov 2019 15:10:02 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2019 15:10:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,302,1569308400"; d="scan'208";a="288035081" X-Received: from aedesimo-desk.amr.corp.intel.com ([10.7.159.171]) by orsmga001.jf.intel.com with ESMTP; 13 Nov 2019 15:10:01 -0800 From: "Desimone, Ashley E" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya Subject: [edk2-devel][edk2-staging/EdkRepo][PATCH] EdkRepo: Support uninstalling packages with '_' in their name. Date: Wed, 13 Nov 2019 15:09:57 -0800 Message-Id: <20191113230957.12644-1-ashley.e.desimone@intel.com> 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,ashley.e.desimone@intel.com X-Gm-Message-State: O8aAs7W9gIBXiQaFjHa7uPnix1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1573686614; bh=y1P66/iZRder3cu7NYk8C7T1Eg943OX+4p3525I4T7Q=; h=Cc:Date:From:Reply-To:Subject:To; b=wcbqBmVclWsXvtPlXrtunWP7dklOTNRRu7EsjSzwPg1lB03YRF5fVMF+4ICsApkkxXX 4eFiXYrMQWwQkZI8SJ/DP6eueix900FEDLbaqthh+TkHBaw+zx5ZBhi3yt2y1/Pod/8CT bMITfCGJ2DvV3YomGjfS8d2o1ow1FX+MtI0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" pip does not support '_' in package names and converts them to '-' after installing the wheel. In order to uninstall affected packages the '_' needs to be converted to a '-' when calculating the package name. Signed-off-by: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Reviewed-by: Nate DeSimone --- edkrepo_installer/EdkRepoInstaller/InstallWorker.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs b/edkrepo_= installer/EdkRepoInstaller/InstallWorker.cs index effc3c4..5a358f9 100644 --- a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs +++ b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs @@ -622,7 +622,10 @@ namespace TianoCore.EdkRepoInstaller { if (Wheel.UninstallAllOtherCopies) { - ExclusivePackages.Add(new Tuple(Wheel.Package.Name, PyInstance.Version)); + // + // pip doesn't understand the difference between '= _' and '-' + // + ExclusivePackages.Add(new Tuple(Wheel.Package.Name.Replace('_', '-'), PyInstance.Version)); } } } --=20 2.16.2.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 (#50599): https://edk2.groups.io/g/devel/message/50599 Mute This Topic: https://groups.io/mt/56505935/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-