Skip to content

Commit

Permalink
binarycaching: Set BinaryProviders::nuget_repo & remove unused field (
Browse files Browse the repository at this point in the history
#1360)

The former wasn't getting set anywhere even though `BinaryCache::push_success()` uses it.

Also remove unused `BinaryConfigParserState::nuget_repo_info` field.
  • Loading branch information
VelocityRa committed Mar 7, 2024
1 parent edaa92b commit 56b4a5b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion include/vcpkg/binarycaching.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ namespace vcpkg
// These are filled in after construction by reading from args and environment
std::string nuget_prefix;
bool use_nuget_cache = false;
NuGetRepoInfo nuget_repo_info;

void clear();
};
Expand Down
5 changes: 4 additions & 1 deletion src/vcpkg/binarycaching.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1880,8 +1880,11 @@ namespace vcpkg

s.nuget_prefix = args.nuget_id_prefix.value_or("");
if (!s.nuget_prefix.empty()) s.nuget_prefix.push_back('_');
ret.nuget_prefix = s.nuget_prefix;

s.use_nuget_cache = args.use_nuget_cache.value_or(false);
s.nuget_repo_info = get_nuget_repo_info_from_env(args);

ret.nuget_repo = get_nuget_repo_info_from_env(args);

auto& fs = paths.get_filesystem();
auto& tools = paths.get_tool_cache();
Expand Down

0 comments on commit 56b4a5b

Please sign in to comment.