Merge branch 'NightlySchedFixes' of git://github.com/garetharmstrongh…

…p/buildbot

* 'NightlySchedFixes' of git://github.com/garetharmstronghp/buildbot:
  Fixes buildbot#823 - Nightly scheduler is not tracking changes when onlyIfChanged is True

Signed-off-by: Dustin J. Mitchell <dustin@zmanda.com>

buildbot/schedulers/timed.py

@@ -50,6 +50,13 @@ def start_HEAD_build(self, t):
         ssid = db.get_sourcestampid(ss, t)
         self.create_buildset(ssid, self.reason, t)
 
+    def start_requested_build(self, t, relevant_changes):
+        # start a build with the requested list of changes on self.branch
+        db = self.parent.db
+        ss = SourceStamp(branch=self.branch, changes=relevant_changes)
+        ssid = db.get_sourcestampid(ss, t)
+        self.create_buildset(ssid, self.reason, t)
+
     def update_last_build(self, t, when):
         # and record when we did it
         state = self.get_state(t)
@@ -249,9 +256,11 @@ def _maybe_start_build(self, t):
                 log.msg("Nightly Scheduler <%s>: "
                         "skipping build - No important change" % self.name)
                 return
-            self.start_HEAD_build(t)
+            relevant_changes = [c for c in (important + unimportant) if
+                                c.branch == self.branch]
+            self.start_requested_build(t, relevant_changes)
             # retire the changes
-            changeids = [c.number for c in (important + unimportant)]
+            changeids = [c.number for c in relevant_changes]
             db.scheduler_retire_changes(self.schedulerid, changeids, t)
         else:
             # start it unconditionally