Profile: be sure to strip newline from 'who' in alert file.

diff --git a/lib/profile.py b/lib/profile.py
index 3f77bb9001a672c6d9167a563d4ac634985e8273..162e2080f9b707cebaed769961d1385dbf9febe2 100644 (file)
--- a/lib/profile.py
+++ b/lib/profile.py
@@ -75,7 +75,7 @@ def rule_matches(rule, event, who, when):
          - day-of-week:  mo,we,fr-su
          - time-of-day: 10.00-11.30,23.30-01.30
     """
-    for r in rule.split(' '):
+    for r in rule.split():
         if r == '':
             continue
         if r == event:
@@ -86,7 +86,7 @@ def rule_matches(rule, event, who, when):
             return False
 
         c = False
-        for w in who.split(' '):
+        for w in who.split():
             if w[-8:] == r[-8:]:
                 c = True
         if c:

diff --git a/utils/lock.py b/utils/lock.py
index d7e0253d671ed34cee3d58d721a6ce87cf5c0259..dcf9690cda9635ae0a9f0a81deb21a6ec17db155 100755 (executable)
--- a/utils/lock.py
+++ b/utils/lock.py
@@ -201,6 +201,7 @@ class SetAlerts:
             f = open(os.path.join(self.alertdir, name))
             l = f.readline()
             f.close()
+            l = l.strip()
         except IOError:
             l = "new"
         n = do_alert(name, l)