Skip to content

Commit

Permalink
(chocolatey#1764) source exit 2 if nothing to do
Browse files Browse the repository at this point in the history
If enhanced exit codes are enabled, this sets the source command to
exit with 2 if there is nothing to do (i.e. if NOCHANGEMESSAGE is
output).
  • Loading branch information
TheCakeIsNaOH committed Jun 16, 2023
1 parent 6397bbf commit 91c40c9
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,17 @@ Exit codes that normally result from running this command.
Normal:
- 0: operation was successful, no issues detected
- -1 or 1: an error has occurred
- 2: nothing to do (enhanced)
NOTE: Starting in v0.10.12, if you have the feature '{0}'
turned on, then choco will provide enhanced exit codes that allow
better integration and scripting.
If you find other exit codes that we have not yet documented, please
file a ticket so we can document it at
https://github.com/chocolatey/choco/issues/new/choose.
");
".format_with(ApplicationParameters.Features.UseEnhancedExitCodes));

"chocolatey".Log().Info(ChocolateyLoggers.Important, "Options and Switches");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ public void AddSource(ChocolateyConfiguration configuration)
)
{
if (!configuration.QuietOutput) this.Log().Warn(NoChangeMessage);

if (configuration.Features.UseEnhancedExitCodes && Environment.ExitCode == 0)
{
Environment.ExitCode = 2;
}
}
else
{
Expand Down Expand Up @@ -183,6 +188,11 @@ public void RemoveSource(ChocolateyConfiguration configuration)
else
{
if (!configuration.QuietOutput) this.Log().Warn(NoChangeMessage);

if (configuration.Features.UseEnhancedExitCodes && Environment.ExitCode == 0)
{
Environment.ExitCode = 2;
}
}
}

Expand All @@ -198,6 +208,11 @@ public void DisableSource(ChocolateyConfiguration configuration)
else
{
if (!configuration.QuietOutput) this.Log().Warn(NoChangeMessage);

if (configuration.Features.UseEnhancedExitCodes && Environment.ExitCode == 0)
{
Environment.ExitCode = 2;
}
}
}

Expand All @@ -213,6 +228,11 @@ public void EnableSource(ChocolateyConfiguration configuration)
else
{
if (!configuration.QuietOutput) this.Log().Warn(NoChangeMessage);

if (configuration.Features.UseEnhancedExitCodes && Environment.ExitCode == 0)
{
Environment.ExitCode = 2;
}
}
}

Expand Down

0 comments on commit 91c40c9

Please sign in to comment.