Attachment 939101 Details for Bug 1142535 – patch

[patch] patch

0001-check-len-of-rpm.mi-objects-instead-of-relying-on-bo.patch (text/plain), 1.67 KB, created by Dan Callaghan on 2014-09-19 06:37:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Callaghan

Created: 2014-09-19 06:37:35 UTC

Size: 1.67 KB

patch

obsolete

>From cedc070020e5987ac5f9d8dae0c5c5f41f23773e Mon Sep 17 00:00:00 2001
>From: Dan Callaghan <dcallagh@redhat.com>
>Date: Fri, 19 Sep 2014 16:33:09 +1000
>Subject: [PATCH] check len() of rpm.mi objects instead of relying on bool
> coercion
>
>Older versions of RPM (including the version in RHEL5 and earlier) did
>not implement bool coercion for rpm.mi objects, they are always true
>even if they contain no matches. So we need to check len() before we can
>assume there are any matches.
>
>Bug: 1142535
>---
> src/python/journalling.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/python/journalling.py b/src/python/journalling.py
>index 7ab824c..af71e8b 100755
>--- a/src/python/journalling.py
>+++ b/src/python/journalling.py
>@@ -296,7 +296,7 @@ class Journal(object):
>       return None
> 
>     testInfo = ts.dbMatch("name", package)
>-    if not testInfo:
>+    if not len(testInfo):
>       return None
> 
>     buildtime = time.gmtime(int(testInfo.next().format("%{BUILDTIME}")))
>@@ -385,7 +385,7 @@ class Journal(object):
>     ts = rpm.ts()
>     mi = ts.dbMatch("name", "beakerlib")
>     beakerlibRpmEl = newdoc.createElement("beakerlib_rpm")
>-    if mi:
>+    if len(mi):
>       beakerlib_rpm = mi.next()
>       beakerlibRpmCon = newdoc.createTextNode("%(name)s-%(version)s-%(release)s " % beakerlib_rpm)
>     else:
>@@ -393,7 +393,7 @@ class Journal(object):
> 
>     mi = ts.dbMatch("name", "beakerlib-redhat")
>     beakerlibRedhatRpmEl = newdoc.createElement("beakerlib_redhat_rpm")
>-    if mi:
>+    if len(mi):
>       beakerlib_redhat_rpm = mi.next()
>       beakerlibRedhatRpmCon = newdoc.createTextNode("%(name)s-%(version)s-%(release)s " % beakerlib_redhat_rpm)
>     else:
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1142535: 938333 | 939101 | 939109