From ef6e70a38b03fab62cb9f299bf0e747783387174 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Sat, 23 Jan 2021 15:24:32 +0200
Subject: [PATCH] Fixed an issue when unnecessary packages were removed in 
 ``update --dry-run`` mode // Resolve #3809

---
 HISTORY.rst                            |  1 +
 platformio/package/manager/platform.py | 37 ++++++++++++++------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 8499b973..826419bd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -19,6 +19,7 @@ PlatformIO Core 5
 * Fixed an issue with Python 3.8+ on Windows when a network drive is used (`issue #3417 <https://github.com/platformio/platformio-core/issues/3417>`_)
 * Fixed an issue when "strict" compatibility mode was not used for a library with custom "platforms" field in `library.json <https://docs.platformio.org/page/librarymanager/config.html>`__ manifest (`issue #3806 <https://github.com/platformio/platformio-core/issues/3806>`_)
 * Fixed an issue with compiler driver for ".ccls" language server (`issue #3808 <https://github.com/platformio/platformio-core/issues/3808>`_)
+* Fixed an issue when unnecessary packages were removed in  ``update --dry-run`` mode (`issue #3809 <https://github.com/platformio/platformio-core/issues/3809>`_)
 
 5.0.4 (2020-12-30)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/package/manager/platform.py b/platformio/package/manager/platform.py
index 71e8c5fb..7626d4d9 100644
--- a/platformio/package/manager/platform.py
+++ b/platformio/package/manager/platform.py
@@ -69,7 +69,7 @@ class PlatformPackageManager(BasePackageManager):  # pylint: disable=too-many-an
         )
         p.install_python_packages()
         p.on_installed()
-        self.cleanup_packages(list(p.packages))
+        self.autoremove_packages(list(p.packages))
         return pkg
 
     def uninstall(self, spec, silent=False, skip_dependencies=False):
@@ -83,7 +83,7 @@ class PlatformPackageManager(BasePackageManager):  # pylint: disable=too-many-an
         if not skip_dependencies:
             p.uninstall_python_packages()
             p.on_uninstalled()
-            self.cleanup_packages(list(p.packages))
+            self.autoremove_packages(list(p.packages))
         return pkg
 
     def update(  # pylint: disable=arguments-differ, too-many-arguments
@@ -118,7 +118,8 @@ class PlatformPackageManager(BasePackageManager):  # pylint: disable=too-many-an
             )
 
         p.update_packages(only_check)
-        self.cleanup_packages(list(p.packages))
+        if not only_check:
+            self.autoremove_packages(list(p.packages))
 
         if missed_pkgs:
             p.install_packages(
@@ -127,28 +128,30 @@ class PlatformPackageManager(BasePackageManager):  # pylint: disable=too-many-an
 
         return new_pkg or pkg
 
-    def cleanup_packages(self, names):
+    def autoremove_packages(self, names):
         self.memcache_reset()
-        deppkgs = {}
+        required = {}
         for platform in PlatformPackageManager().get_installed():
             p = PlatformFactory.new(platform)
             for pkg in p.get_installed_packages():
-                if pkg.metadata.name not in deppkgs:
-                    deppkgs[pkg.metadata.name] = set()
-                deppkgs[pkg.metadata.name].add(pkg.metadata.version)
+                if pkg.metadata.name not in required:
+                    required[pkg.metadata.name] = set()
+                required[pkg.metadata.name].add(pkg.metadata.version)
 
         pm = ToolPackageManager()
         for pkg in pm.get_installed():
-            if pkg.metadata.name not in names:
+            skip_conds = [
+                pkg.metadata.name not in names,
+                pkg.metadata.spec.url,
+                pkg.metadata.name in required
+                and pkg.metadata.version in required[pkg.metadata.name],
+            ]
+            if any(skip_conds):
                 continue
-            if (
-                pkg.metadata.name not in deppkgs
-                or pkg.metadata.version not in deppkgs[pkg.metadata.name]
-            ):
-                try:
-                    pm.uninstall(pkg.metadata.spec)
-                except UnknownPackageError:
-                    pass
+            try:
+                pm.uninstall(pkg.metadata.spec)
+            except UnknownPackageError:
+                pass
 
         self.memcache_reset()
         return True