Skip to content

Commit

Permalink
Merge djmitche/buildbot:8/new-style-steps (PR #1085)
Browse files Browse the repository at this point in the history
+autopep8, pyflakes
  • Loading branch information
djmitche committed Mar 3, 2014
2 parents a6903f0 + 3b66419 commit ad15c3c
Show file tree
Hide file tree
Showing 19 changed files with 975 additions and 195 deletions.
2 changes: 2 additions & 0 deletions master/buildbot/process/build.py
Expand Up @@ -102,6 +102,7 @@ def setLocks(self, lockList):
for access in lockList]

def setSlaveEnvironment(self, env):
# TODO: remove once we don't have anything depending on this method or attribute
self.slaveEnvironment = env

def getSourceStamp(self, codebase=''):
Expand Down Expand Up @@ -320,6 +321,7 @@ def setupBuild(self, expectations):
step = factory.buildStep()
step.setBuild(self)
step.setBuildSlave(self.slavebuilder.slave)
# TODO: remove once we don't have anything depending on setDefaultWorkdir
if callable(self.workdir):
step.setDefaultWorkdir(self.workdir(self.sources))
else:
Expand Down

0 comments on commit ad15c3c

Please sign in to comment.