diff --git a/attract_server/subversion.py b/attract_server/subversion.py index f94f0ae..b9034ef 100644 --- a/attract_server/subversion.py +++ b/attract_server/subversion.py @@ -40,6 +40,10 @@ class CommitLogObserver(object): # assumption: revisions are always logged in strictly increasing order. self.last_seen_revision = log_entry.revision + # Log entries can be None. + if not log_entry.msg: + continue + # Parse the commit log to see if there are any task markers. lines = log_entry.msg.split('\n', 1) first_line = lines[0] diff --git a/tests/test_subversion.py b/tests/test_subversion.py index bf04a84..3af05fd 100644 --- a/tests/test_subversion.py +++ b/tests/test_subversion.py @@ -27,7 +27,7 @@ SVN_LOG_BATCH_1 = [ LogEntry(date=datetime.datetime(2016, 4, 8, 13, 5, 39, 42537, tzinfo=tzutc()), msg='Initial commit of layout files', revision=44, author='hjalti', changelist=None), LogEntry(date=datetime.datetime(2016, 4, 8, 13, 6, 18, 947830, tzinfo=tzutc()), - msg='Second commit of layout files', revision=45, author='hjalti', changelist=None), + msg=None, revision=45, author='andy', changelist=None), LogEntry(date=datetime.datetime(2016, 4, 8, 14, 22, 24, 411916, tzinfo=tzutc()), msg="Add the eye lattices to the main group\n\nOtherwise when you link the agent group, those two lattices would be\nlinked as regular objects, and you'd need to move both proxy+lattices\nindividually.\n\n\n", revision=46, author='pablo', changelist=None),