From 2d6029e41c68fd44b22f8cef1b13fbaa44c8fad9 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 14 Sep 2017 04:04:15 -0700
Subject: Introduce Version::warn_if_vcpkg_version_mismatch()

---
 toolsrc/src/commands_update.cpp | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

(limited to 'toolsrc/src/commands_update.cpp')

diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp
index 35f24af12..42a8333bd 100644
--- a/toolsrc/src/commands_update.cpp
+++ b/toolsrc/src/commands_update.cpp
@@ -2,7 +2,6 @@
 
 #include "Paragraphs.h"
 #include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
 #include "vcpkg_System.h"
 #include "vcpkglib.h"
 
@@ -22,7 +21,7 @@ namespace vcpkg::Commands::Update
         std::vector<OutdatedPackage> output;
         for (const StatusParagraph* pgh : installed_packages)
         {
-            auto it = src_names_to_versions.find(pgh->package.spec.name());
+            const auto it = src_names_to_versions.find(pgh->package.spec.name());
             if (it == src_names_to_versions.end())
             {
                 // Package was not installed from portfile
@@ -69,30 +68,7 @@ namespace vcpkg::Commands::Update
                             install_line);
         }
 
-        auto version_file = paths.get_filesystem().read_contents(paths.root / "toolsrc" / "VERSION.txt");
-        if (auto version_contents = version_file.get())
-        {
-            int maj1, min1, rev1;
-            auto num1 = sscanf_s(version_contents->c_str(), "\"%d.%d.%d\"", &maj1, &min1, &rev1);
-
-            int maj2, min2, rev2;
-            auto num2 = sscanf_s(Version::version().c_str(), "%d.%d.%d-", &maj2, &min2, &rev2);
-
-            if (num1 == 3 && num2 == 3)
-            {
-                if (maj1 != maj2 || min1 != min2 || rev1 != rev2)
-                {
-                    System::println("Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use "
-                                    ".\\bootstrap-vcpkg.bat to update.",
-                                    maj2,
-                                    min2,
-                                    rev2,
-                                    maj1,
-                                    min1,
-                                    rev1);
-                }
-            }
-        }
+        Version::warn_if_vcpkg_version_mismatch(paths);
 
         Checks::exit_success(VCPKG_LINE_INFO);
     }
-- 
cgit v1.2.3


From be27ae05f081997556b3273ba23c6e574d469854 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Thu, 14 Sep 2017 04:13:03 -0700
Subject: Version check is now performed before running any command

(except vcpkg version/hash/contact)
---
 toolsrc/src/commands_update.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'toolsrc/src/commands_update.cpp')

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);
     }
 }
-- 
cgit v1.2.3