Skip to content

Commit

Permalink
(GH-262) Ensure explicit source proxy bypass
Browse files Browse the repository at this point in the history
Also ensure that a source only logs bypassing a proxy when configured
to skip the proxy.
  • Loading branch information
ferventcoder committed Mar 1, 2017
1 parent 569f8fb commit 7f29b62
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Binary file modified lib/NuGet-Chocolatey/NuGet.Core.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions src/chocolatey/infrastructure.app/nuget/NugetCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static IPackageRepository GetRemoteRepository(ChocolateyConfiguration con

if (!string.IsNullOrWhiteSpace(configuration.Proxy.BypassList))
{
"chocolatey".Log().Debug("Proxy has a bypass list of {0}");
"chocolatey".Log().Debug("Proxy has a bypass list of '{0}'.");
proxy.BypassList = configuration.Proxy.BypassList.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
}

Expand Down Expand Up @@ -107,8 +107,8 @@ public static IPackageRepository GetRemoteRepository(ChocolateyConfiguration con

if (machineSource != null)
{
"chocolatey".Log().Debug("Source '{0}' is configured to bypass proxies.".format_with(source));
bypassProxy = machineSource.BypassProxy;
if (bypassProxy) "chocolatey".Log().Debug("Source '{0}' is configured to bypass proxies.".format_with(source));
}
}
catch (Exception ex)
Expand Down

0 comments on commit 7f29b62

Please sign in to comment.