diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2021-01-14 22:43:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 22:43:13 -0800 |
| commit | f87c92e42c56cf45316ba395504bdfb53967347d (patch) | |
| tree | 73e2abc8230816a6c9c64372069e317cb6384efa /toolsrc/src | |
| parent | f649f9a67e0769aabb04f02ccaba816abd0089e2 (diff) | |
| download | vcpkg-f87c92e42c56cf45316ba395504bdfb53967347d.tar.gz vcpkg-f87c92e42c56cf45316ba395504bdfb53967347d.zip | |
Reorder CI checks (#15662)
* Reorder CI checks
* Modify error message on local port changes
* Modify error message on local port changes - pt.2
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/commands.civerifyversions.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/toolsrc/src/vcpkg/commands.civerifyversions.cpp b/toolsrc/src/vcpkg/commands.civerifyversions.cpp index 7f142e279..82a98aa9d 100644 --- a/toolsrc/src/vcpkg/commands.civerifyversions.cpp +++ b/toolsrc/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); |