commit 72940d68c20122e1829d1be9c421b9d36ec02bc0
author Rob Mohr <mohrr@google.com> Mon Sep 26 22:02:11 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 26 22:02:11 2022 +0000
tree 2d70c8b4933889d39763b44c6fc8c04d05441951
parent fa1dc6208a48e844ddf52c7e8252331ada9ced9a

Revert "pw_env_setup: Skip downloading overridden packages"

This reverts commit fa1dc6208a48e844ddf52c7e8252331ada9ced9a.

Reason for revert: broke a downstream project

Original change's description:
> pw_env_setup: Skip downloading overridden packages
>
> Bug: b/246971220
> Change-Id: I31db4cad2519289ecc80e87448536a46a279dfd6
> Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/110476
> Reviewed-by: Wyatt Hepler <hepler@google.com>
> Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
> Commit-Queue: Rob Mohr <mohrr@google.com>

TBR=mohrr@google.com,hepler@google.com,pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com,tonymd@google.com

Change-Id: I0ded5600a15e060f960d943f098466c0fa028c3e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/246971220
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/112171
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>

pw_env_setup/py/pw_env_setup/cipd_setup/update.py

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
index 8f4d411..73140a4 100755
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/update.py
@@ -21,7 +21,6 @@
 
 from __future__ import print_function
 
-import collections
 import hashlib
 import json
 import os
@@ -192,8 +191,9 @@
     return result
 
 
-def all_packages(package_files):
+def write_ensure_file(package_files, ensure_file, platform):  # pylint: disable=redefined-outer-name
     packages = []
+
     for package_file in package_files:
         name = package_file_name(package_file)
         with open(package_file, 'r') as ins:
@@ -204,28 +204,13 @@
                 else:
                     package['subdir'] = name
             packages.extend(file_packages)
-    return packages
-
-
-def deduplicate_packages(packages):
-    deduped = collections.OrderedDict()
-    for package in reversed(packages):
-        if package['path'] in deduped:
-            del deduped[package['path']]
-        deduped[package['path']] = package
-    return reversed(deduped.values())
-
-
-def write_ensure_file(package_files, ensure_file, platform):  # pylint: disable=redefined-outer-name
-    packages = all_packages(package_files)
-    deduped_packages = deduplicate_packages(packages)
 
     with open(ensure_file, 'w') as outs:
         outs.write('$VerifiedPlatform linux-amd64\n'
                    '$VerifiedPlatform mac-amd64\n'
                    '$ParanoidMode CheckPresence\n')
 
-        for pkg in deduped_packages:
+        for pkg in packages:
             # If this is a new-style package manifest platform handling must
             # be done here instead of by the cipd executable.
             if 'platforms' in pkg and platform not in pkg['platforms']: