← Back to branch summary

~gary/bzrbuildbot/dev

« back to all changes in this revision

Viewing changes to bzrbuildbot/poller.py

  • Committer: Gary Poster
  • Date: 2008-12-13 00:57:10 UTC
  • mfrom: (15.1.9 bzrbuildbot)
  • Revision ID: gary.poster@canonical.com-20081213005710-ujpgqoojglsq06kc
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrbuildbot/poller.py
58
58
        try:
59
59
            # On a big tree, even individual elements of the bzr commands can
60
60
            # take awhile.  So we just push the bzr work off to a thread.
61
 
            changes = yield twisted.internet.threads.deferToThread(
62
 
                self.getRawChanges)
63
 
            for change in changes:
64
 
                change['branch'] = self.url
65
 
                yield self.addChange(buildbot.changes.changes.Change(**change))
66
 
                self.last_revision = change['revision']
 
61
            try:
 
62
                changes = yield twisted.internet.threads.deferToThread(
 
63
                    self.getRawChanges)
 
64
            except (SystemExit, KeyboardInterrupt):
 
65
                raise
 
66
            except:
 
67
                # we'll try again next poll.  Meanwhile, let's report.
 
68
                twisted.python.log.err()
 
69
            else:
 
70
                for change in changes:
 
71
                    change['branch'] = self.url
 
72
                    yield self.addChange(
 
73
                        buildbot.changes.changes.Change(**change))
 
74
                    self.last_revision = change['revision']
67
75
        finally:
68
76
            self.polling = False
69
77