Skip to content

Commit

Permalink
(GH-1285) Add old/new default push source
Browse files Browse the repository at this point in the history
Add checks to see if someone is using an old or new push source. If one
of those is being used, display the warning about moderation.
  • Loading branch information
ferventcoder committed May 18, 2017
1 parent 921c8eb commit f508b68
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/chocolatey/infrastructure.app/ApplicationParameters.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public static class ApplicationParameters
public static readonly string ChocolateyPackageInfoStoreLocation = _fileSystem.combine_paths(InstallLocation, ".chocolatey");
public static readonly string ExtensionsLocation = _fileSystem.combine_paths(InstallLocation, "extensions");
public static readonly string TemplatesLocation = _fileSystem.combine_paths(InstallLocation, "templates");
public static readonly string ChocolateyCommunityFeedPushSource = "https://chocolatey.org/";
public static readonly string ChocolateyCommunityFeedPushSourceOld = "https://chocolatey.org/";
public static readonly string ChocolateyCommunityFeedPushSource = "https://push.chocolatey.org/";
public static readonly string ChocolateyCommunityFeedSource = "https://chocolatey.org/api/v2/";
public static readonly string ChocolateyLicensedFeedSource = "https://licensedpackages.chocolatey.org/api/v2/";
public static readonly string ChocolateyLicensedFeedSourceName = "chocolatey.licensed";
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey/infrastructure.app/services/NugetService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public void push_run(ChocolateyConfiguration config)
NugetPush.push_package(config, _fileSystem.get_full_path(nupkgFilePath));


if (config.Sources.is_equal_to(ApplicationParameters.ChocolateyCommunityFeedPushSource) && config.RegularOutput)
if (config.RegularOutput && (config.Sources.is_equal_to(ApplicationParameters.ChocolateyCommunityFeedPushSource) ||config.Sources.is_equal_to(ApplicationParameters.ChocolateyCommunityFeedPushSourceOld)))
{
this.Log().Warn(ChocolateyLoggers.Important, () => @"
Expand Down

0 comments on commit f508b68

Please sign in to comment.