[PATCH v3 18/20] isar-sstate: adopt sstate maintenance script

[Anton Mikanovich <amikan@ilbers.de>]

Fix sstate maintenance helper script to work with updated Bitbake
siginfo data format.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 scripts/isar-sstate | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/isar-sstate b/scripts/isar-sstate
index 8ea85ed..cb2d2d0 100755
--- a/scripts/isar-sstate
+++ b/scripts/isar-sstate
@@ -124,7 +124,7 @@ import shutil
 import sys
 from tempfile import NamedTemporaryFile
 import time
-import pickle
+import json
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'bitbake', 'lib'))
 from bb.siggen import compare_sigfiles
@@ -802,16 +802,18 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, **kwargs):
     hits_other = 0
     for sig in cache_sigs.values():
         sig_file = target.download(sig.path)
-        with open(sig_file, 'rb') as f:
-            sigdata_raw = pickle.Unpickler(f)
-            sigdata = sigdata_raw.load()
+
+        with bb.compress.zstd.open(sig_file, "rt", encoding="utf-8", num_threads=1) as f:
+            sigdata = json.load(f, object_hook=bb.siggen.SetDecoder)
+
+            bb.siggen.handle_renames(sigdata)
 
             pn_issues = []
             for name, val in sigdata['varvals'].items():
                 if not name[0].isupper():
                     continue
-                if sigdata['basewhitelist'] and name in sigdata['basewhitelist'] or \
-                   sigdata['taskwhitelist'] and name in sigdata['taskwhitelist'] or \
+                if sigdata['basehash_ignore_vars'] and name in sigdata['basehash_ignore_vars'] or \
+                   sigdata['taskhash_ignore_tasks'] and name in sigdata['taskhash_ignore_tasks'] or \
                    name in ADDITIONAL_IGNORED_VARNAMES:
                     continue
                 if not val or not val[0] == '/':
-- 
2.17.1