# HG changeset patch
# User wbell
# Date 1237662334 0
# Node ID 81e43e3770e67843ddb2adbba6dbbe1776e7a163
# Parent  ed37b6a0289754d0dd4ef96c61c822c5493f89ca
Fixing some small issues with level retrieval with the new file based log implementation.

diff --git a/bitten/model.py b/bitten/model.py
--- a/bitten/model.py
+++ b/bitten/model.py
@@ -791,12 +791,12 @@
                 log_lines = codecs.open(log_filename, "rb", "UTF-8").readlines()
             else:
                 log_lines = []
-            level_filename = log.filename + ".levels"
+            level_filename = log.get_log_file(log.filename + ".levels")
             if os.path.exists(level_filename):
-                log_levels = dict(enumerate(codecs.open(log.get_log_file(level_filename), "rb", "UTF-8").readlines()))
+                log_levels = dict(enumerate(codecs.open(level_filename, "rb", "UTF-8").readlines()))
             else:
                 log_levels = {}
-            log.messages = [(log_levels.get(line_num, BuildLog.UNKNOWN), line.rstrip("\n")) for line_num, line in enumerate(log_lines)]
+            log.messages = [(log_levels.get(line_num, BuildLog.UNKNOWN).rstrip("\n"), line.rstrip("\n")) for line_num, line in enumerate(log_lines)]
         else:
             log.messages = []
 
diff --git a/bitten/tests/master.py b/bitten/tests/master.py
--- a/bitten/tests/master.py
+++ b/bitten/tests/master.py
@@ -370,8 +370,8 @@
             self.assertEqual('http://bitten.cmlenz.net/tools/python#unittest',
                              logs[0].generator)
             self.assertEqual(2, len(logs[0].messages))
-            self.assertEqual((u'', u'Doing stuff'), logs[0].messages[0])
-            self.assertEqual((u'', u'Ouch that hurt'), logs[0].messages[1])
+            self.assertEqual((u'info', u'Doing stuff'), logs[0].messages[0])
+            self.assertEqual((u'error', u'Ouch that hurt'), logs[0].messages[1])
 
     def test_process_build_step_success_with_report(self):
         recipe = """<build>