Merge branch 'pr1070' into stable

* pr1070: (GH-1069) Fix - Disable failOnInvalidOrMissingLicense Feature
chocolatey · Jan 21, 2017 · 04f7788 · 04f7788
2 parents 366a9fb + 1cf2e19
commit 04f7788
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs
@@ -121,7 +121,10 @@ private void set_source_type(ChocolateyConfiguration config)
 
         public void fail_when_license_is_missing_or_invalid_if_requested(ChocolateyConfiguration config)
         {
-            if (!config.Features.FailOnInvalidOrMissingLicense) return;
+            if (!config.Features.FailOnInvalidOrMissingLicense ||
+                config.CommandName.trim_safe().is_equal_to("feature") ||
+                config.CommandName.trim_safe().is_equal_to("features")
+            ) return;
 
             if (!config.Information.IsLicensedVersion) throw new ApplicationException("License is missing or invalid.");
         }