Skip to content

Commit

Permalink
Let rmdir timeout after self.timeout.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpommerening committed Nov 6, 2013
1 parent 2569efe commit c6b37bd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions master/buildbot/steps/source/cvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ def full(self):

def _clobber(self):
cmd = buildstep.RemoteCommand('rmdir', {'dir': self.workdir,
'logEnviron': self.logEnviron})
'logEnviron': self.logEnviron,
'timeout': self.timeout})
cmd.useLog(self.stdio_log, False)
d = self.runCommand(cmd)

Expand Down Expand Up @@ -146,7 +147,8 @@ def clean(self, ):

def copy(self):
cmd = buildstep.RemoteCommand('rmdir', {'dir': self.workdir,
'logEnviron': self.logEnviron})
'logEnviron': self.logEnviron,
'timeout': self.timeout})
cmd.useLog(self.stdio_log, False)
d = self.runCommand(cmd)
old_workdir = self.workdir
Expand Down

0 comments on commit c6b37bd

Please sign in to comment.