From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.1752.1584481384524974811 for ; Tue, 17 Mar 2020 14:43:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: NnthyNgbJY/j6NOP1k8tEMBnKPrq1lInE9xY7lPX+DmKTZGPdBrcFduJ/qIKEtFPv4MPvIlLfr SE6S5o/fjQ3Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 14:43:03 -0700 IronPort-SDR: 3AlbqyhRT/oOPmqkXuDGt9QoUDDR20oC0T3LvEGDQJkHP3jpSkIn/j32Zq5iI8L0577J65Vph4 sUgeynmggIWw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,565,1574150400"; d="scan'208";a="443913995" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by fmsmga005.fm.intel.com with ESMTP; 17 Mar 2020 14:43:04 -0700 Received: from orsmsx116.amr.corp.intel.com ([169.254.7.196]) by ORSMSX101.amr.corp.intel.com ([169.254.8.225]) with mapi id 14.03.0439.000; Tue, 17 Mar 2020 14:43:03 -0700 From: "Desimone, Ashley E" To: "Desimone, Nathaniel L" , "devel@edk2.groups.io" CC: "Pandya, Puja" , "Bjorge, Erik C" , Bret Barkelew Subject: Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Uninstaller does not uninstall packages with '_' in their name. Thread-Topic: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Uninstaller does not uninstall packages with '_' in their name. Thread-Index: AQHV+7j3NBN81rjgGkKhixsIb7I2k6hNUnHw Date: Tue, 17 Mar 2020 21:43:03 +0000 Message-ID: <4CF3A9EB60ABDA47BE7821A4DA3A0A3353D5822E@ORSMSX116.amr.corp.intel.com> References: <20200316173248.1678-1-nathaniel.l.desimone@intel.com> <20200316173248.1678-2-nathaniel.l.desimone@intel.com> In-Reply-To: <20200316173248.1678-2-nathaniel.l.desimone@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ashley DeSimone -----Original Message----- From: Desimone, Nathaniel L =20 Sent: Monday, March 16, 2020 10:33 AM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Pandya, Puja ; Bjorge, Erik C ; Bret Barkelew Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Uninstaller does not unins= tall packages with '_' in their name. pip does not support '_' in package names and converts them to '-' after in= stalling the wheel. In order to uninstall affected packages the '_' needs t= o be converted to a '-' when calculating the package name. Cc: Ashley DeSimone Cc: Puja Pandya Cc: Erik Bjorge Cc: Bret Barkelew Signed-off-by: Nate DeSimone --- edkrepo_installer/EdkRepoInstaller/InstallWorker.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs b/edkrepo_= installer/EdkRepoInstaller/InstallWorker.cs index 5a358f9..f9738fd 100644 --- a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs +++ b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs @@ -550,10 +550,16 @@ namespace TianoCore.EdkRepoInstaller { if (VendorCustomizer.Instance.GetPythonWheelsToUninstall != =3D null) { - return VendorCustomizer.Instance.GetPythonWheelsToUnin= stall(); + // + // pip doesn't understand the difference between '_' a= nd '-' + // + return=20 + VendorCustomizer.Instance.GetPythonWheelsToUninstall().Select(p =3D>=20 + p.Replace('_', '-')); } } - return new string[] { InstallerStrings.EdkrepoPackageName }; + // + // pip doesn't understand the difference between '_' and '-' + // + return (new string[] { InstallerStrings.EdkrepoPackageName=20 + }).Select(p =3D> p.Replace('_', '-')); } =20 public void PerformInstall(Action ReportComplete, Acti= on ReportProgress, Action AllowCancel, Func CancelPending) -- 2.24.0.windows.2