Skip to content

Commit

Permalink
(GH-795) Adjust message for missing licensed code
Browse files Browse the repository at this point in the history
When certain features are missing in the licensed code that Chocolatey
needs to call into, the messaging has been a little confusing, possibly
a little scary. Adjust the messaging a bit.
  • Loading branch information
ferventcoder committed Jun 16, 2016
1 parent bc9fef7 commit 1573906
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -451,9 +451,9 @@ private static void set_licensed_options(ChocolateyConfiguration config, Chocola

if (licensedConfigBuilder == null)
{
if (config.RegularOutput) "chocolatey".Log().Warn(ChocolateyLoggers.Important,
@"Unable to set licensed configuration. This is likely related to a
missing or outdated licensed DLL.");
if (config.RegularOutput) "chocolatey".Log().Warn(ChocolateyLoggers.Important,
@"Unable to set licensed configuration. Please upgrade to a newer
licensed version.");
return;
}
try
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,8 @@ private static void set_licensed_environment(ChocolateyConfiguration config)
if (licensedEnvironmentSettings == null)
{
if (config.RegularOutput) "chocolatey".Log().Warn(
ChocolateyLoggers.Important,
@"Unable to set licensed environment. This is likely related to a
missing or outdated licensed DLL.");
ChocolateyLoggers.Important, @"Unable to set licensed environment settings. Please upgrade to a newer
licensed version.");
return;
}
try
Expand All @@ -128,7 +127,7 @@ private static void set_licensed_environment(ChocolateyConfiguration config)
{
"chocolatey".Log().Error(
ChocolateyLoggers.Important,
@"Error when setting configuration for '{0}':{1} {2}".format_with(
@"Error when setting environment for '{0}':{1} {2}".format_with(
licensedEnvironmentSettings.FullName,
Environment.NewLine,
ex.Message
Expand Down

0 comments on commit 1573906

Please sign in to comment.