churchyard / rpms / mock

Forked from rpms/mock 5 years ago
Clone
b451fe8
From 9c804837c4229bbeda1e9773a94bde5596acadbe Mon Sep 17 00:00:00 2001
b451fe8
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
b451fe8
Date: Fri, 14 Jun 2019 21:11:25 +0200
b451fe8
Subject: [PATCH 2/2] Fix compatibility with pre-4.15 RPM versions with
b451fe8
 DynamicBuildRequires
b451fe8
b451fe8
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
b451fe8
---
b451fe8
 py/mockbuild/backend.py | 3 ++-
b451fe8
 1 file changed, 2 insertions(+), 1 deletion(-)
b451fe8
b451fe8
diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
b451fe8
index fad14aaf..f0f73a6d 100644
b451fe8
--- a/py/mockbuild/backend.py
b451fe8
+++ b/py/mockbuild/backend.py
b451fe8
@@ -283,7 +283,8 @@ class Commands(object):
b451fe8
 
b451fe8
             # Check if we will have dynamic BuildRequires, but do not allow it
b451fe8
             hdr = next(util.yieldSrpmHeaders((rebuilt_srpm,)))
b451fe8
-            dynamic_buildreqs = 'rpmlib(DynamicBuildRequires)' in hdr[rpm.RPMTAG_REQUIRES]
b451fe8
+            requires = {util._to_text(req) for req in hdr[rpm.RPMTAG_REQUIRES]}
b451fe8
+            dynamic_buildreqs = 'rpmlib(DynamicBuildRequires)' in requires
b451fe8
 
b451fe8
             if dynamic_buildreqs and not self.config.get('dynamic_buildrequires'):
b451fe8
                 raise Error('DynamicBuildRequires are found but support is disabled.'
b451fe8
-- 
b451fe8
2.22.0
b451fe8