From a8cecc026b52f5d4484e1aed059c48a824a03491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 27 Sep 2023 20:34:24 +0200 Subject: [PATCH] server: fix extracting name from repo url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add more explicit errors about not matching repo or branch. Signed-off-by: Jakub SokoĊ‚owski --- files/server.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/files/server.py b/files/server.py index d6858d1..870f123 100644 --- a/files/server.py +++ b/files/server.py @@ -55,7 +55,7 @@ class ManagedRepo: @property def name(self): if self.url.startswith('https://'): - name = urlparse(self.url).path + name = urlparse(self.url).path.strip('/') else: name = self.url.split(':').pop() if name.endswith('.git'): @@ -100,8 +100,11 @@ def define_push_hook(repo, post_action): branch = remove_prefix(data['ref'], 'refs/heads/') name = data['repository']['full_name'] - if name != repo.name or branch != repo.branch: - log.warning('Repo event does not match configred repo') + if name != repo.name: + log.error('Wrong repo: Event(%s) != Local(%s)', name, repo.name) + return + if branch != repo.branch: + log.error('Wrong branch: Event(%s) != Local(%s)', branch, repo.branch) return new_commit = data['head_commit']['id']