(chocolatey#933) Re-use chocolatey that we already have

We can't just tell it not to append the logger. If we do that, we cause a regression of 697. But we can use the instance we already have, and just backup and restore the config.
corbob · Aug 25, 2022 · 88d5fb0 · 88d5fb0
1 parent 6524dbf
commit 88d5fb0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
@@ -172,8 +172,8 @@ public async Task<PackageOperationResult> InstallPackage(
             using (await Lock.WriteLockAsync())
             {
                 var logger = new SerilogLogger(Logger, _progressService);
-                var choco = Lets.GetChocolatey(initializeLogging: false).SetCustomLogging(logger, logExistingMessages: false, addToExistingLoggers: false);
-                choco.Set(
+                var currentConfig = _choco.GetConfiguration();
+                _choco.Set(
                     config =>
                         {
                             config.CommandName = CommandNameType.install.ToString();
@@ -244,14 +244,18 @@ public async Task<PackageOperationResult> InstallPackage(
 
                 using (logger.Intercept(grabErrors))
                 {
-                    await choco.RunAsync();
+                    await _choco.RunAsync();
 
                     if (Environment.ExitCode != 0)
                     {
                         Environment.ExitCode = 0;
                         return new PackageOperationResult { Successful = false, Messages = errors.ToArray() };
                     }
 
+                    _choco.Set(config =>
+                    {
+                        config = currentConfig;
+                    });
                     return PackageOperationResult.SuccessfulCached;
                 }
             }