From 23ab5ef4e4302824a6f5b5384f63e589c93417a8 Mon Sep 17 00:00:00 2001
From: s3lph <1375407-s3lph@users.noreply.gitlab.com>
Date: Tue, 19 Apr 2022 01:35:28 +0200
Subject: [PATCH] Release v0.1.1

---
 CHANGELOG.md               | 16 +++++++++++++++-
 multischleuder/__init__.py |  2 +-
 multischleuder/conflict.py |  3 ++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ed073c..f2f2011 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,18 @@
-# EasyWKS Changelog
+# MultiSchleuder Changelog
+
+<!-- BEGIN RELEASE v0.1.1 -->
+## Version 0.1.1
+
+Bugfix release
+
+### Changes
+
+<!-- BEGIN CHANGES 0.1.1 -->
+- Fix logging (almost nothing was logged)
+- Fix a typo in the Debian systemd timer
+<!-- END CHANGES 0.1.1 -->
+
+<!-- END RELEASE v0.1.1 -->
 
 <!-- BEGIN RELEASE v0.1 -->
 ## Version 0.1
diff --git a/multischleuder/__init__.py b/multischleuder/__init__.py
index 373d726..6655893 100644
--- a/multischleuder/__init__.py
+++ b/multischleuder/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.1'
+__version__ = '0.1.1'
diff --git a/multischleuder/conflict.py b/multischleuder/conflict.py
index 3af4520..9943eea 100644
--- a/multischleuder/conflict.py
+++ b/multischleuder/conflict.py
@@ -86,7 +86,8 @@ class KeyConflictResolution:
         logging.debug(f'Key Conflict for {earliest.email} in lists, chose {earliest.key.fingerprint}:')
         for s in subscriptions:
             fpr = 'no key' if s.key is None else s.key.fingerprint
-            logging.debug(f'  {s.schleuder}: {fpr}')
+            sschleuder = sourcemap.get(s.schleuder, 'unknown')
+            logging.debug(f'  {sschleuder}: {fpr}')
         # Generate a SHA1 digest that only changes when the subscription list changes
         digest = self._make_key_digest(earliest, subscriptions)
         msg: Optional[Message] = None