aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-09-14 04:13:03 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-09-14 04:13:03 -0700
commitbe27ae05f081997556b3273ba23c6e574d469854 (patch)
tree9abcfb71b0238e8c52152bc3fa7188dd8016e951
parentd55036a7978d122292f3e33c84ae49269ba5498b (diff)
downloadvcpkg-be27ae05f081997556b3273ba23c6e574d469854.tar.gz
vcpkg-be27ae05f081997556b3273ba23c6e574d469854.zip
Version check is now performed before running any command
(except vcpkg version/hash/contact)
-rw-r--r--toolsrc/src/commands_update.cpp2
-rw-r--r--toolsrc/src/vcpkg.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp
index 42a8333bd..71ea4b063 100644
--- a/toolsrc/src/commands_update.cpp
+++ b/toolsrc/src/commands_update.cpp
@@ -68,8 +68,6 @@ namespace vcpkg::Commands::Update
install_line);
}
- Version::warn_if_vcpkg_version_mismatch(paths);
-
Checks::exit_success(VCPKG_LINE_INFO);
}
}
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 75b61f952..f4300a73c 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -69,6 +69,7 @@ static void inner(const VcpkgCmdArguments& args)
const VcpkgPaths paths = expected_paths.value_or_exit(VCPKG_LINE_INFO);
const int exit_code = _wchdir(paths.root.c_str());
Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working dir failed");
+ Commands::Version::warn_if_vcpkg_version_mismatch(paths);
if (const auto command_function = Commands::find(args.command, Commands::get_available_commands_type_b()))
{