edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
If a VendorCustomizer is being used, the EdkRepo installer erroneously
lists every version of Python as obsolete even though they are not.
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs b/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
index 622d7ad..da49006 100644
--- a/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
+++ b/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
@@ -250,7 +250,7 @@ namespace TianoCore.EdkRepoInstaller
NewObsoletedPythonVersions.Add(new PythonVersion(version));
}
PythonVersions = NewPythonVersions;
- ObsoletedPythonVersions = NewPythonVersions;
+ ObsoletedPythonVersions = NewObsoletedPythonVersions;
};
}
}
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55900): https://edk2.groups.io/g/devel/message/55900
Mute This Topic: https://groups.io/mt/72004229/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Monday, March 16, 2020 10:33 AM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Installer would lists every Python version as obsolete
If a VendorCustomizer is being used, the EdkRepo installer erroneously lists every version of Python as obsolete even though they are not.
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs b/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
index 622d7ad..da49006 100644
--- a/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
+++ b/edkrepo_installer/EdkRepoInstaller/VendorCustomizer.cs
@@ -250,7 +250,7 @@ namespace TianoCore.EdkRepoInstaller
NewObsoletedPythonVersions.Add(new PythonVersion(version));
}
PythonVersions = NewPythonVersions;
- ObsoletedPythonVersions = NewPythonVersions;
+ ObsoletedPythonVersions =
+ NewObsoletedPythonVersions;
};
}
}
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55933): https://edk2.groups.io/g/devel/message/55933
Mute This Topic: https://groups.io/mt/72004229/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
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.
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
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 != null)
{
- return VendorCustomizer.Instance.GetPythonWheelsToUninstall();
+ //
+ // pip doesn't understand the difference between '_' and '-'
+ //
+ return VendorCustomizer.Instance.GetPythonWheelsToUninstall().Select(p => p.Replace('_', '-'));
}
}
- return new string[] { InstallerStrings.EdkrepoPackageName };
+ //
+ // pip doesn't understand the difference between '_' and '-'
+ //
+ return (new string[] { InstallerStrings.EdkrepoPackageName }).Select(p => p.Replace('_', '-'));
}
public void PerformInstall(Action<bool, bool> ReportComplete, Action<int> ReportProgress, Action<bool> AllowCancel, Func<bool> CancelPending)
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55901): https://edk2.groups.io/g/devel/message/55901
Mute This Topic: https://groups.io/mt/72004232/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Monday, March 16, 2020 10:33 AM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Uninstaller does not uninstall packages with '_' in their name.
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.
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
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 != null)
{
- return VendorCustomizer.Instance.GetPythonWheelsToUninstall();
+ //
+ // pip doesn't understand the difference between '_' and '-'
+ //
+ return
+ VendorCustomizer.Instance.GetPythonWheelsToUninstall().Select(p =>
+ p.Replace('_', '-'));
}
}
- return new string[] { InstallerStrings.EdkrepoPackageName };
+ //
+ // pip doesn't understand the difference between '_' and '-'
+ //
+ return (new string[] { InstallerStrings.EdkrepoPackageName
+ }).Select(p => p.Replace('_', '-'));
}
public void PerformInstall(Action<bool, bool> ReportComplete, Action<int> ReportProgress, Action<bool> AllowCancel, Func<bool> CancelPending)
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55934): https://edk2.groups.io/g/devel/message/55934
Mute This Topic: https://groups.io/mt/72004232/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
edkrepo_installer/EdkRepoInstaller/App.xaml.cs | 4 ++--
edkrepo_installer/EdkRepoInstaller/InstallWorker.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
index 58186c9..5d23624 100644
--- a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
+++ b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
@@ -185,7 +185,7 @@ namespace TianoCore.EdkRepoInstaller
{
InstallLogger.Log(string.Format("{0} is a third party version of {1}. {0} is already installed.", DisplayName, ProductName));
InstallLogger.Log(string.Format("To install this version of {1}, {0} must be uninstalled first.", DisplayName, ProductName));
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(4000);
}
@@ -200,7 +200,7 @@ namespace TianoCore.EdkRepoInstaller
);
if (Uninstall == MessageBoxResult.Yes)
{
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(1000);
}
diff --git a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
index 5a358f9..c37189b 100644
--- a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
+++ b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
@@ -672,7 +672,7 @@ namespace TianoCore.EdkRepoInstaller
{
InstallLogger.Log(string.Format("Uninstalling {0}...", UninstallerPath));
string UninstallString = string.Format("\"{0}\" /Uninstall /Passive", UninstallerPath);
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(4000);
}
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55902): https://edk2.groups.io/g/devel/message/55902
Mute This Topic: https://groups.io/mt/72004234/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Ashley DeSimone <ashley.e.desimone@intel.com>
-----Original Message-----
From: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
Sent: Monday, March 16, 2020 10:33 AM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bjorge, Erik C <erik.c.bjorge@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>
Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Use /S switch to pass command args in installer
Cc: Ashley DeSimone <ashley.e.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
---
edkrepo_installer/EdkRepoInstaller/App.xaml.cs | 4 ++--
edkrepo_installer/EdkRepoInstaller/InstallWorker.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
index 58186c9..5d23624 100644
--- a/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
+++ b/edkrepo_installer/EdkRepoInstaller/App.xaml.cs
@@ -185,7 +185,7 @@ namespace TianoCore.EdkRepoInstaller
{
InstallLogger.Log(string.Format("{0} is a third party version of {1}. {0} is already installed.", DisplayName, ProductName));
InstallLogger.Log(string.Format("To install this version of {1}, {0} must be uninstalled first.", DisplayName, ProductName));
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(4000);
}
@@ -200,7 +200,7 @@ namespace TianoCore.EdkRepoInstaller
);
if (Uninstall == MessageBoxResult.Yes)
{
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(1000);
}
diff --git a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
index 5a358f9..c37189b 100644
--- a/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
+++ b/edkrepo_installer/EdkRepoInstaller/InstallWorker.cs
@@ -672,7 +672,7 @@ namespace TianoCore.EdkRepoInstaller
{
InstallLogger.Log(string.Format("Uninstalling {0}...", UninstallerPath));
string UninstallString = string.Format("\"{0}\" /Uninstall /Passive", UninstallerPath);
- SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/c \"{0}\"", UninstallString));
+ SilentProcess p = SilentProcess.StartConsoleProcessSilently("cmd.exe", string.Format("/S /C \"{0}\"", UninstallString));
p.WaitForExit();
Thread.Sleep(4000);
}
--
2.24.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#55935): https://edk2.groups.io/g/devel/message/55935
Mute This Topic: https://groups.io/mt/72004234/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.