From 7c61ddf09e6502416a79c231daf95ed87b1966a0 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Mar 07 2023 23:25:16 +0000 Subject: Avoid calling repo_name from load_nameverrel Method load_repo_name() calls load_nameverrel(), which calls repo_name() to format its error message. That leads to calling load_repo_name() again, and so on to endless recursion. Prevent this situation by simplifying load_nameverrel() error messages. Fixes: #657 JIRA: RHELCMP-11192 Merges: https://pagure.io/rpkg/pull-request/658 Signed-off-by: Otto Liljalaakso --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index 9855059..acdad22 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -739,7 +739,7 @@ class Commands(object): self._rel = docker_release return else: - raise rpkgError("Dockerfile for {0} not found.".format(self.repo_name)) + raise rpkgError("Dockerfile not found.") # Otherwise, we get 'verrel' information from the '.spec' file. cmd = ['rpm'] @@ -766,8 +766,7 @@ class Commands(object): except Exception as e: self.log.debug('Errors occoured while running following command to get N-V-R-E:') self.log.debug(joined_cmd) - raise rpkgError('Could not query n-v-r of %s: %s' - % (self.repo_name, e)) + raise rpkgError('Could not query n-v-r: %s' % e) if err: self.log.debug('Errors occoured while running following command to get N-V-R-E:') self.log.debug(joined_cmd)