From 592dbd0ad3b464d14aba7ccec918d5ed7f9429fc Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Thu, 11 Mar 2021 15:12:29 -0500 Subject: misc: finish removing deprecated cop API Fix bug in crcchecker. It must be possible to remove a non-production .api file Type: improvement Signed-off-by: Dave Barach Change-Id: I00b953e58017cc53051e6f4d8a70403dce8219a0 --- extras/scripts/crcchecker.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'extras/scripts') diff --git a/extras/scripts/crcchecker.py b/extras/scripts/crcchecker.py index fdaef21c27c..f3021c3c8b6 100755 --- a/extras/scripts/crcchecker.py +++ b/extras/scripts/crcchecker.py @@ -23,7 +23,8 @@ def crc_from_apigen(revision, filename): all APIs in filename''' if not revision and not os.path.isfile(filename): print(f'skipping: {filename}', file=sys.stderr) - return {} + # Return instead of + return {-1} if revision: apigen = (f'{APIGENBIN} --git-revision {revision} --includedir src ' @@ -213,10 +214,12 @@ def check_patchset(): for filename in files: # Ignore files that have version < 1.0.0 _ = crc_from_apigen(None, filename) - if _['_version']['major'] == '0': - continue + # Ignore removed files + if isinstance(_, set) == 0: + if isinstance(_, set) == 0 and _['_version']['major'] == '0': + continue + newcrcs.update(_) - newcrcs.update(_) oldcrcs.update(crc_from_apigen(revision, filename)) backwards_incompatible = report(newcrcs, oldcrcs) -- cgit 1.2.3-korg