From c8c40218f0a271d281670249b713da5fb4cb7b7f Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Thu, 20 Feb 2020 17:10:59 +0100 Subject: [PATCH] mock: fix dynamic buildrequires unnecesarry loop per discussion here: https://github.com/rpm-software-management/mock/issues/434 Mock should accept return code 0 from rpm. Relates: #434 --- mock/py/mockbuild/backend.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mock/py/mockbuild/backend.py b/mock/py/mockbuild/backend.py index 8d1f70d5a..aa68f82fa 100644 --- a/mock/py/mockbuild/backend.py +++ b/mock/py/mockbuild/backend.py @@ -712,14 +712,12 @@ def get_command(mode): except Error as e: if e.resultcode != 11: raise e + finally: max_loops -= 1 self.buildroot.root_log.info("Dynamic buildrequires detected") self.buildroot.root_log.info("Going to install missing buildrequires") buildreqs = glob.glob(bd_out + '/SRPMS/*.buildreqs.nosrc.rpm') self.installSrpmDeps(*buildreqs) - packages_after = self.buildroot.all_chroot_packages() - if packages_after == packages_before: - success = True for f_buildreqs in buildreqs: os.remove(f_buildreqs) if not sc: