diff --git a/obs/update_unstable.py b/obs/update_unstable.py index 715c2ec..db8dbc9 100755 --- a/obs/update_unstable.py +++ b/obs/update_unstable.py @@ -29,27 +29,20 @@ MESSAGE_TEMPLATE = """ ## OBS package update report Updated at {{ date.today().strftime('%Y-%m-%d') }} - {% for repository, update in repositories.items() %} + ### {{ repository }} -Updated {{ update | length }} packages. +Examined {{ update | length }} packages changed upstream: {% for package, remote, state in update %} {% if state != "error" %} -* {{ package }} [{{ state[0:8] }}(https://commits.kde.org/{{ remote }}/{{ state }} +- {{ package }} updated to [{{ state[0:8] }}](https://commits.kde.org/{{ remote }}/{{ state }}) {% else %} -{% set errors = errors + [package] %} +- {{ package }} not updated (source service error) {% endif %} {% endfor %} {% endfor %} - -## Packages with errors - -{% for error in errors %} -* {{ error }} -{% endfor %} - """ @@ -178,12 +171,10 @@ class RepoUpdater: def notify_matrix(update_data: Dict[str, List[Tuple[str, str]]]) -> None: - template = Environment(loader=BaseLoader).from_string(MESSAGE_TEMPLATE) + template = Environment(loader=BaseLoader, lstrip_blocks=True, + trim_blocks=True).from_string(MESSAGE_TEMPLATE) - errors = list() - import pdb - pdb.set_trace() - message = template.render(repositories=update_data, errors=errors) + message = template.render(repositories=update_data, date=date) cmd = [MATRIX_COMMANDER, "--markdown", "-m", message] logging.debug("Sending Matrix notification")