From eea966b0c8ba72b92fce1794d859126e14d4dfcf Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros@users.noreply.github.com>
Date: Thu, 26 Dec 2024 14:22:50 +0200
Subject: [PATCH] Minor code changes

- Slight code restructure
- Normalize single/double quote usage
---
 scripts/platformio/install-deps.py     | 52 ++++++++++++++------------
 scripts/platformio/platformio-build.py | 13 +++++--
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/scripts/platformio/install-deps.py b/scripts/platformio/install-deps.py
index 9cab1f1a9b37..27e0d3313640 100644
--- a/scripts/platformio/install-deps.py
+++ b/scripts/platformio/install-deps.py
@@ -182,19 +182,23 @@ def load_west_manifest(manifest_path):
             sys.stderr.write(str(exc) + "\n")
             sys.exit(1)
 
+
 def load_state_json(state_path):
     with open(state_path, encoding="utf8") as fp:
         return json.load(fp)
 
+
 def clear_deprecated_package(path, packages_folder):
     deprecated_pkg_path = os.path.join(packages_folder, path)
     if os.path.isdir(deprecated_pkg_path):
-        shutil.rmtree(deprecated_pkg_path)
+        clean_up(deprecated_pkg_path)
     else:
         print("Package path not found")
 
-def process_bundled_projects(platform_name, packages_folder, west_manifest,
-                             state_manifest = None):
+
+def process_bundled_projects(
+    platform_name, packages_folder, west_manifest, state_manifest=None
+):
     assert (
         "projects" in west_manifest
     ), "Missing the `projects` field in the package manifest!"
@@ -206,24 +210,24 @@ def process_bundled_projects(platform_name, packages_folder, west_manifest,
     # If there is a state.json manifest, compare it with west.yml
     if state_manifest:
         # Convert west.yml data into a dictionary for easier comparison
-        west_dep = {proj['name']: proj for proj in west_manifest['projects']}
-        modified = []
-        # Check for modified entries
-        for name, state_hash in state_manifest.items():
-            if name in west_dep:
-                west_revision = west_dep[name].get('revision')
-                if state_hash != west_revision:
-                    modified.append({
-                        'name': name,
-                        'state_hash': state_hash,
-                        'west_revision': west_revision,
-                        'path': west_dep[name].get('path')
-                    })
-        # If deprecated dependency found, clear its folder to download correct version
-        for deprecated_entries in modified:
-            print(f"Package {deprecated_entries['name']} version differs from west.yml..\n\
-                    Upgrading to {deprecated_entries['west_revision']}\n")
-            clear_deprecated_package(deprecated_entries['path'], packages_folder)
+        west_dep = {proj["name"]: proj for proj in west_manifest["projects"]}
+        modified_projects = [
+            {
+                "name": name,
+                "state_hash": state_hash,
+                "west_revision": west_dep[name].get("revision"),
+                "path": west_dep[name].get("path"),
+            }
+            for name, state_hash in state_manifest.items()
+            if name in west_dep and state_hash != west_dep[name].get("revision")
+        ]
+
+        for project in modified_projects:
+            print(
+                f"The version of the `{project['name']}` package changed, "
+                f"upgrading to `{project['west_revision']}`."
+            )
+            clear_deprecated_package(project["path"], packages_folder)
 
     default_remote = west_manifest.get("defaults", {}).get("remote", "")
     remotes = {remote["name"]: remote for remote in west_manifest["remotes"]}
@@ -285,6 +289,9 @@ def main(platform_name, secondary_installation, manifest_path):
         )
         sys.exit(1)
 
+    if not manifest_path:
+        manifest_path = os.path.join(framework_dir, "west.yml")
+
     west_manifest = load_west_manifest(os.path.realpath(manifest_path))
     if os.path.isfile(state_file):
         state_manifest = load_state_json(state_file)
@@ -319,9 +326,6 @@ def main(platform_name, secondary_installation, manifest_path):
     parser.add_argument(
         "--manifest",
         type=str,
-        default=os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), "..", "..", "west.yml"
-        ),
         help="Path to the west.yml manifest file",
     )
     cargs = parser.parse_args()
diff --git a/scripts/platformio/platformio-build.py b/scripts/platformio/platformio-build.py
index 7bb5382096a1..3d37aba877b2 100644
--- a/scripts/platformio/platformio-build.py
+++ b/scripts/platformio/platformio-build.py
@@ -1307,13 +1307,13 @@ def load_west_manifest():
     framework_manifest_path = os.path.join(FRAMEWORK_DIR, "west.yml")
 
     if os.path.isfile(project_manifest_path):
+        print("Info: Using a project-based dependency manifest file.")
         manifest_path = project_manifest_path
     elif os.path.isfile(framework_manifest_path):
-        print("Info: No project based dependency manifest found \n \
-               Default west.yml will be used..")
         manifest_path = framework_manifest_path
     else:
-        sys.stderr.write("Error: Couldn't find `%s`\n" % framework_manifest_path)
+        sys.stderr.write(
+            "Error: Couldn't find `%s`\n" % framework_manifest_path)
         env.Exit(1)
 
     with open(manifest_path) as fp:
@@ -1806,11 +1806,16 @@ def GenerateMCUbootBinaryCmd(env, target, source):
 install_python_deps()
 
 #
-# Initial targets loading and install Zephyr dependencies
+# Install Zephyr dependencies
 #
 
 west_manifest, manifest_path = load_west_manifest()
 install_bundled_projects(manifest_path)
+
+#
+# Initial targets loading
+#
+
 codemodel = get_cmake_code_model(west_manifest)
 if not codemodel:
     sys.stderr.write("Error: Couldn't find code model generated by CMake\n")