From 82bab660c8d4c48535437b3940b875f1d621ec28 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 18 Jul 2016 10:45:40 -0400
Subject: [PATCH] Be honest.  This is a task_id, not a build_id.

---
 rida/builder.py                  | 10 +++++-----
 rida/database.py                 |  6 +++---
 rida/logger.py                   |  2 +-
 rida/scheduler/handlers/repos.py |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rida/builder.py b/rida/builder.py
index 9f76a2bd..0fcde89c 100644
--- a/rida/builder.py
+++ b/rida/builder.py
@@ -260,7 +260,7 @@ class KojiModuleBuilder(GenericBuilder):
     def build(self, artifact_name, source):
         """
         :param source : scmurl to spec repository
-        :return koji build id
+        :return koji build task id
         """
         if not self.__prep:
             raise RuntimeError("Buildroot is not prep-ed")
@@ -268,10 +268,10 @@ class KojiModuleBuilder(GenericBuilder):
         if '://' not in source:
             raise NotImplementedError("Only scm url is currently supported, got source='%s'" % source)
         self._koji_whitelist_packages([artifact_name,])
-        build_id = self.koji_session.build(source, self.module_target['name'])
-        log.info("%r submitted build of %s (build_id=%s)" % (
-            self, source, build_id))
-        return build_id
+        task_id = self.koji_session.build(source, self.module_target['name'])
+        log.info("%r submitted build of %s (task_id=%s)" % (
+            self, source, task_id))
+        return task_id
 
     def _get_tag(self, tag, strict=True):
         if isinstance(tag, dict):
diff --git a/rida/database.py b/rida/database.py
index be24c26c..9f4a2997 100644
--- a/rida/database.py
+++ b/rida/database.py
@@ -232,7 +232,7 @@ class ComponentBuild(Base):
     gitref = Column(String, nullable=False)
     # XXX: Consider making this a proper ENUM
     format = Column(String, nullable=False)
-    build_id = Column(Integer)  # This is the id of the build in koji
+    task_id = Column(Integer)  # This is the id of the build in koji
     # XXX: Consider making this a proper ENUM (or an int)
     state = Column(Integer)
 
@@ -243,14 +243,14 @@ class ComponentBuild(Base):
     def from_fedmsg(cls, session, msg):
         if '.buildsys.build.state.change' not in msg['topic']:
             raise ValueError("%r is not a koji message." % msg['topic'])
-        return session.query(cls).filter(cls.build_id==msg['msg']['build_id']).first()
+        return session.query(cls).filter(cls.task_id==msg['msg']['task_id']).first()
 
     def json(self):
         return {
             'id': self.id,
             'package': self.package,
             'format': self.format,
-            'build_id': self.build_id,
+            'task_id': self.task_id,
             'state': self.state,
             'module_build': self.module_id,
         }
diff --git a/rida/logger.py b/rida/logger.py
index b1596672..eb48cf8f 100644
--- a/rida/logger.py
+++ b/rida/logger.py
@@ -38,7 +38,7 @@ import logging
 
 logging.debug("Phasers are set to stun.")
 logging.info("%s tried to build something", username)
-logging.warn("%s failed to build", build_id)
+logging.warn("%s failed to build", task_id)
 
 """
 
diff --git a/rida/scheduler/handlers/repos.py b/rida/scheduler/handlers/repos.py
index 60d75e72..76b7c8bb 100644
--- a/rida/scheduler/handlers/repos.py
+++ b/rida/scheduler/handlers/repos.py
@@ -59,5 +59,5 @@ def done(config, session, msg):
         )
         artifact_name = 'TODO'
         component_build.state = koji.BUILD_STATES['BUILDING']
-        component_build.build_id = builder.build(artifact_name, scmurl)
+        component_build.task_id = builder.build(artifact_name, scmurl)
     session.commit()