Blame 0015-abrt-action-list-dsos-do-not-decode-not-existing-obj.patch
|
Matej Habrnal |
34dad7 |
From c17cb1999357d9be51b8118661a8f35569c66dd0 Mon Sep 17 00:00:00 2001
|
|
Matej Habrnal |
34dad7 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
Matej Habrnal |
34dad7 |
Date: Thu, 14 May 2015 16:27:02 +0200
|
|
Matej Habrnal |
34dad7 |
Subject: [PATCH] abrt-action-list-dsos: do not decode not existing object
|
|
Matej Habrnal |
34dad7 |
|
|
Matej Habrnal |
34dad7 |
If you build a package using 'make rpm', there is no vendor param in it.
|
|
Matej Habrnal |
34dad7 |
So this is the reason why the Decode method was called on None object.
|
|
Matej Habrnal |
34dad7 |
|
|
Matej Habrnal |
34dad7 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
Matej Habrnal |
34dad7 |
---
|
|
Matej Habrnal |
34dad7 |
src/plugins/abrt-action-list-dsos | 7 ++++++-
|
|
Matej Habrnal |
34dad7 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
Matej Habrnal |
34dad7 |
|
|
Matej Habrnal |
34dad7 |
diff --git a/src/plugins/abrt-action-list-dsos b/src/plugins/abrt-action-list-dsos
|
|
Matej Habrnal |
34dad7 |
index f4a1536..a3078a5 100644
|
|
Matej Habrnal |
34dad7 |
--- a/src/plugins/abrt-action-list-dsos
|
|
Matej Habrnal |
34dad7 |
+++ b/src/plugins/abrt-action-list-dsos
|
|
Matej Habrnal |
34dad7 |
@@ -82,10 +82,15 @@ if __name__ == "__main__":
|
|
Matej Habrnal |
34dad7 |
if outname:
|
|
Matej Habrnal |
34dad7 |
outfile = xopen(outname, "w")
|
|
Matej Habrnal |
34dad7 |
outname = None
|
|
Matej Habrnal |
34dad7 |
+
|
|
Matej Habrnal |
34dad7 |
+ vendor = h[rpm.RPMTAG_VENDOR]
|
|
Matej Habrnal |
34dad7 |
+ if vendor != None:
|
|
Matej Habrnal |
34dad7 |
+ verdor = vendor.decode('utf-8')
|
|
Matej Habrnal |
34dad7 |
+
|
|
Matej Habrnal |
34dad7 |
outfile.write("%s %s (%s) %s\n" %
|
|
Matej Habrnal |
34dad7 |
(path,
|
|
Matej Habrnal |
34dad7 |
h[rpm.RPMTAG_NEVRA].decode('utf-8'),
|
|
Matej Habrnal |
34dad7 |
- h[rpm.RPMTAG_VENDOR].decode('utf-8'),
|
|
Matej Habrnal |
34dad7 |
+ verdor,
|
|
Matej Habrnal |
34dad7 |
h[rpm.RPMTAG_INSTALLTIME])
|
|
Matej Habrnal |
34dad7 |
)
|
|
Matej Habrnal |
34dad7 |
|
|
Matej Habrnal |
34dad7 |
--
|
|
Matej Habrnal |
34dad7 |
2.4.1
|
|
Matej Habrnal |
34dad7 |
|