From 86c8fdc17720eccf915c4031cc349bcbfa0e0d04 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Nov 18 2021 10:12:48 +0000
Subject: use json results


---

diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py
index 3403423..58f25d1 100644
--- a/plugins/builder/kiwi.py
+++ b/plugins/builder/kiwi.py
@@ -1,6 +1,5 @@
 import glob
-#import json
-import pickle
+import json
 import os
 import xml.dom.minidom
 from fnmatch import fnmatch
@@ -353,8 +352,7 @@ class KiwiCreateImageTask(BaseBuildTask):
         if rv:
             raise koji.GenericError("Kiwi failed")
 
-        result = pickle.load(open(joinpath(broot.rootdir(), target_dir[1:], 'kiwi.result'), 'rb'))
-        #result = json.load(open(joinpath(broot.rootdir(), target_dir[1:], 'kiwi.result'), 'rb'))
+        result = json.load(open(joinpath(broot.rootdir(), target_dir[1:], 'kiwi.result'), 'rb'))
 
         imgdata = {
             'arch': arch,
@@ -377,7 +375,7 @@ class KiwiCreateImageTask(BaseBuildTask):
         #     self.uploadFile(os.path.join(broot.rootdir()), remoteName=img_file)
         #     imgdata['files'].append(img_file)
         fpath = os.path.join(broot.rootdir(),
-                             result.result_files['disk_format_image'].filename[1:])
+                             result['result_files']['disk_format_image'].filename[1:])
         img_file = os.path.basename(fpath)
         self.uploadFile(fpath, remoteName=os.path.basename(img_file))
         imgdata['files'].append(img_file)
@@ -386,7 +384,7 @@ class KiwiCreateImageTask(BaseBuildTask):
             if False:
                 # should be used after kiwi update
                 fpath = os.path.join(broot.rootdir(),
-                                     result.result_files['image_packages'].filename[1:])
+                                     result['result_files']['image_packages'].filename[1:])
                 hdrlist = self.getImagePackages(fpath)
             else:
                 cachepath = os.path.join(broot.rootdir(), 'var/cache/kiwi/dnf')
diff --git a/plugins/cli/kiwi.py b/plugins/cli/kiwi.py
index 0de6559..c2fb6af 100644
--- a/plugins/cli/kiwi.py
+++ b/plugins/cli/kiwi.py
@@ -1,4 +1,3 @@
-import os
 from optparse import OptionParser
 
 from koji import canonArch