From b7ce0f017fd5d98b7c641a2784e9b1c4c9dec834 Mon Sep 17 00:00:00 2001
From: Martin Kutlak <mkutlak@redhat.com>
Date: Fri, 12 Jul 2019 16:44:19 +0200
Subject: [PATCH] a-a-list-dsos: Add check for decode attribute
rpm used to return bytes but that was changed to return strings in recent release.
The check for decode attribute keeps compatibility with older fedora releases.
This can be removed in the future with rpm 4.15(?)
Related: rhbz#1693751
Resolves: rhbz#1694970
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
---
src/plugins/abrt-action-list-dsos | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
index adb228a41..5d1240cb4 100644
--- a/src/plugins/abrt-action-list-dsos
+++ b/src/plugins/abrt-action-list-dsos
@@ -84,15 +84,21 @@ if __name__ == "__main__":
outname = None
vendor = h[rpm.RPMTAG_VENDOR]
- if vendor != None:
+ if vendor is not None and hasattr(vendor, 'decode'):
vendor = vendor.decode('utf-8')
+ rpmtag_nevra = h[rpm.RPMTAG_NEVRA]
+ # FIXME change from bugzilla #1693751
+ # can be removed with rpm 4.15
+ if hasattr(rpmtag_nevra, 'decode'):
+ rpmtag_nevra = rpmtag_nevra.decode('utf-8')
+
outfile.write("%s %s (%s) %s\n" %
- (path,
- h[rpm.RPMTAG_NEVRA].decode('utf-8'),
- vendor,
- h[rpm.RPMTAG_INSTALLTIME])
- )
+ (path,
+ rpmtag_nevra,
+ vendor,
+ h[rpm.RPMTAG_INSTALLTIME])
+ )
except Exception as ex:
error_msg_and_die("Can't get the DSO list: %s" % ex)
--
2.21.0