From 3eadeed006e547a3f54cfedc13775810cf145a69 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 14 Jan 2021 22:43:13 -0800 Subject: [PATCH] Reorder CI checks (#15662) * Reorder CI checks * Modify error message on local port changes * Modify error message on local port changes - pt.2 --- src/vcpkg/commands.civerifyversions.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vcpkg/commands.civerifyversions.cpp b/src/vcpkg/commands.civerifyversions.cpp index 7f142e279bcf4e..82a98aa9d64f4c 100644 --- a/src/vcpkg/commands.civerifyversions.cpp +++ b/src/vcpkg/commands.civerifyversions.cpp @@ -229,11 +229,10 @@ namespace vcpkg::Commands::CIVerifyVersions return { Strings::format("Error: While reading versions for port %s from file: %s\n" " File declares version `%s` with SHA: %s\n" - " But local port with the same verion has a differint SHA: %s\n" - " This may be caused by locally commited changes to the port.\n" - " Run:\n\n" - " vcpkg x-add-version %s --overwrite-version\n\n" - " to overwrite the declared version's SHA.", + " But local port with the same verion has a different SHA: %s\n" + " Please update the port's version fields and then run:\n\n" + " vcpkg x-add-version %s\n\n" + " to add a new version.", port_name, fs::u8string(versions_file_path), top_entry.first.versiont, @@ -402,7 +401,7 @@ namespace vcpkg::Commands::CIVerifyVersions } System::print2(System::Color::error, "\nTo attempt to resolve all erros at once, run:\n\n" - " vcpkg x-add-version --all --overwrite-versions\n\n"); + " vcpkg x-add-version --all\n\n"); Checks::exit_fail(VCPKG_LINE_INFO); } Checks::exit_success(VCPKG_LINE_INFO);