diff options
author | Harry Youd <harry@harryyoud.co.uk> | 2019-04-09 14:32:44 +0100 |
---|---|---|
committer | Harry Youd <harry@harryyoud.co.uk> | 2019-04-09 14:44:17 +0100 |
commit | e452d7af47f2cd4dc8cbd42dc09307fd214ea567 (patch) | |
tree | 1c32af41dbf36bcd2ae3511dd0114f5732f4c022 | |
parent | ba9c8130b05e5a2cd1a0b1895558249c1fab310d (diff) | |
download | scripts-e452d7af47f2cd4dc8cbd42dc09307fd214ea567.tar.gz scripts-e452d7af47f2cd4dc8cbd42dc09307fd214ea567.tar.bz2 scripts-e452d7af47f2cd4dc8cbd42dc09307fd214ea567.zip |
Stop common repos creeping in as devices
Change-Id: Ifc37c84e9247846df79dee4f264e12b26779260b
-rw-r--r-- | device-deps-regenerator/devices.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/device-deps-regenerator/devices.py b/device-deps-regenerator/devices.py index ff44206..b2533cf 100644 --- a/device-deps-regenerator/devices.py +++ b/device-deps-regenerator/devices.py @@ -5,6 +5,7 @@ with open('out.json') as f: devices = {} suffixes = {} +blacklist = ['sepolicy', 'devicesettings', 'common'] def simplify_reverse_deps(repo, device): # repo['branch'] = cm-14.1 or cm-14.1-caf or cm-14.1-sony @@ -22,12 +23,12 @@ def simplify_reverse_deps(repo, device): return res for repo in mapping: - if 'device' in repo and 'common' not in repo: - codename = repo.split('_', maxsplit=3)[-1] - if codename in devices: - print("warning: dupe: %s"%codename) - - devices[codename] = sorted(list(set(simplify_reverse_deps({'repo': repo}, codename)))) + if 'device' not in repo or any(x in repo for x in blacklist): + continue + codename = repo.split('_', maxsplit=3)[-1] + if codename in devices: + print("warning: dupe: %s"%codename) + devices[codename] = sorted(list(set(simplify_reverse_deps({'repo': repo}, codename)))) with open('devices.json', 'w') as f: out = {'devices': devices, 'suffixes': suffixes} |