jobs: Drop update_message()

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 0fce4deb1cf0ef46317030ee08f5c22a2fddada0..ae19952bbe0a01dfc5f9f8bb34cc8a4de94b2ef4 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -594,9 +594,6 @@ class Build(base.DataObject):
                if self.pkg and self.pkg.commit:
                        return self.pkg.commit
 
-       def update_message(self, message):
-               self._set_attribute("message", message)
-
        def has_perm(self, user):
                """
                        Check, if the given user has the right to perform administrative

diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py
index b0fb12ebf9e9704afd4c3607b81d74b9e74a5b59..a500a208d72b9ad31ce4216c892c5bf27a735096 100644 (file)
--- a/src/buildservice/jobs.py
+++ b/src/buildservice/jobs.py
@@ -290,7 +290,7 @@ class Job(base.DataObject):
                                self.log("state_change", state=state, user=user)
 
                # Always clear the message when the status is changed.
-               self.update_message(None)
+               self.message = None
 
                # Update some more informations.
                if state == "dispatching":
@@ -314,13 +314,12 @@ class Job(base.DataObject):
        state = property(get_state, set_state)
 
        def set_message(self, message):
-               self._set_attribute("message", "%s" % message)
+               if message:
+                       message = "%s" % message
 
-       message = property(lambda s: s.data.message, set_message)
+               self._set_attribute("message", message)
 
-       # XXX DEPRECATED
-       def update_message(self, message):
-               self.message = message
+       message = property(lambda s: s.data.message, set_message)
 
        def get_builder(self):
                if self.data.builder_id:
@@ -660,7 +659,7 @@ class Job(base.DataObject):
                # Catch dependency errors and log the problem string.
                except DependencyError, e:
                        self.dependency_check_succeeded = False
-                       self.update_message("%s" % e)
+                       self.message = e
 
                # The dependency check has succeeded
                else:

diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index 89512a05c0291661f631d9e05c36722320705558..77b0136fad4a5dd0086ab6b055c269b9260637f2 100644 (file)
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -553,10 +553,9 @@ class BuildersJobsStateHandler(BuildersBaseHandler):
                        raise tornado.web.HTTPError(403, "Altering another builder's build.")
 
                # Save information to database.
-               job.state = state
-
-               message = self.get_argument("message", None)
-               job.update_message(message)
+               with self.db.transaction():
+                       job.state = state
+                       job.message = self.get_argument("message", None)
 
                self.finish("OK")