diff options
| author | Jim Hebert <jimhebert@chromium.org> | 2013-07-09 11:34:08 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-07-10 14:23:50 -0700 |
| commit | eef1493c43a0c2c1c02e5caf45f574a98514d104 (patch) | |
| tree | 6f4f335f5106f9701621f764adb1fb4a5308a3b4 /scripts/cros_extract_deps.py | |
| parent | 5e28616fa713a880b6c3a2e1b8d1e40cba77a5f3 (diff) | |
| download | chromite-eef1493c43a0c2c1c02e5caf45f574a98514d104.tar.gz | |
Update format=cpe output to match consumer-side requirements.
This also adds sorting so that it's more deterministic and amenable
to diffing between runs.
BUG=none
TEST=cros_extract_deps --format=cpe --board=x86-generic chromeos
Change-Id: Ib5894c811c7747c53727fabd8086bfda13b720cd
Reviewed-on: https://gerrit.chromium.org/gerrit/61322
Tested-by: Jim Hebert <jimhebert@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Commit-Queue: Jim Hebert <jimhebert@chromium.org>
Diffstat (limited to 'scripts/cros_extract_deps.py')
| -rw-r--r-- | scripts/cros_extract_deps.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/cros_extract_deps.py b/scripts/cros_extract_deps.py index c4180bd55..ad65ec33c 100644 --- a/scripts/cros_extract_deps.py +++ b/scripts/cros_extract_deps.py @@ -113,11 +113,11 @@ def ExtractCPEList(deps_list): cpe_dump = [] for cpv, record in deps_list.items(): if record["cpes"]: - for cpe in record["cpes"]: - cpe_dump.append({"Name": cpv, "Target": cpe, "Repository": "cros"}) + cpe_dump.append({"Name": cpv, "Targets": sorted(record["cpes"]), + "Repository": "cros"}) else: cros_build_lib.Warning("No CPE entry for %s", cpv) - return cpe_dump + return sorted(cpe_dump, key=lambda k: k["Name"]) def main(argv): |