churchyard / rpms / mock

Forked from rpms/mock 5 years ago
Clone
Blob Blame History Raw
From 9c804837c4229bbeda1e9773a94bde5596acadbe Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Fri, 14 Jun 2019 21:11:25 +0200
Subject: [PATCH 2/2] Fix compatibility with pre-4.15 RPM versions with
 DynamicBuildRequires

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
 py/mockbuild/backend.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
index fad14aaf..f0f73a6d 100644
--- a/py/mockbuild/backend.py
+++ b/py/mockbuild/backend.py
@@ -283,7 +283,8 @@ class Commands(object):
 
             # Check if we will have dynamic BuildRequires, but do not allow it
             hdr = next(util.yieldSrpmHeaders((rebuilt_srpm,)))
-            dynamic_buildreqs = 'rpmlib(DynamicBuildRequires)' in hdr[rpm.RPMTAG_REQUIRES]
+            requires = {util._to_text(req) for req in hdr[rpm.RPMTAG_REQUIRES]}
+            dynamic_buildreqs = 'rpmlib(DynamicBuildRequires)' in requires
 
             if dynamic_buildreqs and not self.config.get('dynamic_buildrequires'):
                 raise Error('DynamicBuildRequires are found but support is disabled.'
-- 
2.22.0