(chocolateyGH-305) Do not fail by default on auto uninstaller

If auto uninstaller fails, do not fail the package by default. Allow the user to change the feature `failOnAutoUninstaller` to allow for packages to fail when the uninstall feature fails.
ferventcoder · Jun 5, 2015 · 21c7740 · 21c7740
1 parent fb516e4
commit 21c7740
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/src/chocolatey/infrastructure.app/ApplicationParameters.cs b/src/chocolatey/infrastructure.app/ApplicationParameters.cs
@@ -77,6 +77,7 @@ public static class Features
         {
             public static readonly string CheckSumFiles = "checksumFiles";
             public static readonly string AutoUninstaller = "autoUninstaller";
+            public static readonly string FailOnAutoUninstaller = "failOnAutoUninstaller";
             public static readonly string AllowGlobalConfirmation = "allowGlobalConfirmation";
         }
 

diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -129,6 +129,7 @@ private static void set_feature_flags(ChocolateyConfiguration config, ConfigFile
         {
             config.Features.CheckSumFiles = set_feature_flag(ApplicationParameters.Features.CheckSumFiles, configFileSettings);
             config.Features.AutoUninstaller = set_feature_flag(ApplicationParameters.Features.AutoUninstaller, configFileSettings);
+            config.Features.FailOnAutoUninstaller = set_feature_flag(ApplicationParameters.Features.FailOnAutoUninstaller, configFileSettings);
             config.PromptForConfirmation = !set_feature_flag(ApplicationParameters.Features.AllowGlobalConfirmation, configFileSettings);
         }
 

diff --git a/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs b/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
@@ -297,6 +297,7 @@ public sealed class FeaturesConfiguration
     {
         public bool AutoUninstaller { get; set; }
         public bool CheckSumFiles { get; set; }
+        public bool FailOnAutoUninstaller { get; set; }
     }
 
     //todo: retrofit other command configs this way

diff --git a/src/chocolatey/infrastructure.app/configuration/chocolatey.config b/src/chocolatey/infrastructure.app/configuration/chocolatey.config
@@ -9,5 +9,6 @@
     <feature name="checksumFiles" enabled="true" />
     <feature name="autoUninstaller" enabled="false" />
     <feature name="allowGlobalConfirmation" enabled="false" />
+    <feature name="failOnAutoUninstaller" enabled="false" />
   </features>
 </chocolatey>
diff --git a/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs b/src/chocolatey/infrastructure.app/services/AutomaticUninstallerService.cs
@@ -173,7 +173,7 @@ public void run(PackageResult packageResult, ChocolateyConfiguration config)
                     Environment.ExitCode = exitCode;
                     string logMessage = " Auto uninstaller failed. Please remove machine installation manually.{0} Exit code was {1}".format_with(Environment.NewLine, exitCode);
                     this.Log().Error(() => logMessage);
-                    packageResult.Messages.Add(new ResultMessage(ResultType.Error, logMessage));
+                    packageResult.Messages.Add(new ResultMessage(config.Features.FailOnAutoUninstaller ? ResultType.Error : ResultType.Warn, logMessage));
                 }
                 else
                 {