mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Fix incorrect handling of messages for permenantly disabled metrics. (#15636)

Browse Source 
Fixes #15630
This commit is contained in:
Billy O'Neal 2021-01-14 08:41:53 -08:00 committed by GitHub
parent fd67439f01
commit 3f3d9a615a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/azure-pipelines/end-to-end-tests-dir/disable-metrics.ps1
View File

@ -41,6 +41,12 @@ try {
throw "Environment variable did not disable metrics."
}
# Also test that you get no message without --sendmetrics
$vcpkgOutput = Run-Vcpkg list
if ($vcpkgOutput -contains $metricsAreDisabledMessage) {
throw "Disabled metrics emit message even without --sendmetrics"
}
if (-Not (Test-Metrics-Enabled '--no-disable-metrics')) {
throw "Environment variable to disable metrics could not be overridden by switch."
}

2
toolsrc/src/vcpkg.cpp
View File

@ -256,7 +256,7 @@ int main(const int argc, const char* const* const argv)
metrics->set_send_metrics(*p);
}
if (args.send_metrics.value_or(true) && !metrics->metrics_enabled())
if (args.send_metrics.value_or(false) && !metrics->metrics_enabled())
{
System::print2(System::Color::warning, "Warning: passed --sendmetrics, but metrics are disabled.\n");
}