Skip to content

Commit

Permalink
Merge pull request #384 from jgonzalezmendez/sourcedata_repo_step
Browse files Browse the repository at this point in the history
remove branch from Repo step's source data
  • Loading branch information
tomprince committed Apr 18, 2012
2 parents ed599cf + 94a0c06 commit dd97424
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions slave/buildslave/commands/repo.py
Expand Up @@ -53,7 +53,7 @@ def setup(self, args):
# to the master as string anyway and using eval() could have security implications.
self.repo_downloaded = ""

self.sourcedata = "%s %s %s" % (self.manifest_url, self.manifest_branch, self.manifest_file)
self.sourcedata = "%s %s" % (self.manifest_url, self.manifest_file)
self.re_change = re.compile(".* refs/changes/\d\d/(\d+)/(\d+) -> FETCH_HEAD$")
self.re_head = re.compile("^HEAD is now at ([0-9a-f]+)...")

Expand Down Expand Up @@ -142,7 +142,7 @@ def _cleanupCommand(self):
repo forall -c git reset --hard HEAD 2>/dev/null
""") % self.__dict__
return "\n".join([ s.strip() for s in command.splitlines()])

def _doPreInitCleanUp(self, dummy):
command = self._cleanupCommand()
return self._Cmd(["bash", "-c", command], self._doInit, abandonOnFailure=False)
Expand Down

0 comments on commit dd97424

Please sign in to comment.