From 2cd852e98ca4578b8e138c64630c585e11bd1cce Mon Sep 17 00:00:00 2001 From: OBS update bot Date: Tue, 5 Dec 2023 20:09:21 +0100 Subject: [PATCH] Catch errors and log them --- obs/update_unstable.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/obs/update_unstable.py b/obs/update_unstable.py index 6691942..b9ce3a3 100755 --- a/obs/update_unstable.py +++ b/obs/update_unstable.py @@ -61,8 +61,15 @@ def project_exists(project: str) -> bool: def get_remote_hash(url: str, branch: str = "master") -> str: gitcmd = git.cmd.Git() - revision = gitcmd.ls_remote(url, f"refs/heads/{branch}", - quiet=True, refs=True) + try: + revision = gitcmd.ls_remote(url, f"refs/heads/{branch}", + quiet=True, refs=True) + except git.exc.GitCommandError: + # Catch API errors + return + + if not revision: + return git_hash, branch = revision.split("\t") return git_hash @@ -168,6 +175,10 @@ class RepoUpdater: local_hash = self._data[repository].get(kde_name, "") remote_hash = get_remote_hash(url, branch) + if remote_hash is None: + logging.error("Failed to update repo at URL %s", url) + continue + if local_hash != remote_hash: logging.debug("Hash doesn't match, marking as changed") to_update[repo] = remote_hash