Skip to content

Commit

Permalink
Pass the local environments variables along with getProcessOutput
Browse files Browse the repository at this point in the history
This is required for ssh agent authentication which uses:
  SSH2_AUTH_SOCK
  SSH2_CLIENT
  SSH_AA_SOCK
  • Loading branch information
Bill committed May 24, 2010
1 parent 0947412 commit b4c5301
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions buildbot/changes/svnpoller.py
Expand Up @@ -13,7 +13,7 @@
from buildbot.changes.changes import Change

import xml.dom.minidom
import urllib
import os, urllib

def _assert(condition, msg):
if condition:
Expand Down Expand Up @@ -183,6 +183,9 @@ def __init__(self, svnurl, split_file=None,

self.revlinktmpl = revlinktmpl

self.environ = os.environ.copy() # include environment variables
# required for ssh-agent auth

self.svnbin = svnbin
self.pollinterval = pollinterval
self.histmax = histmax
Expand Down Expand Up @@ -272,7 +275,7 @@ def checksvn(self):

def getProcessOutput(self, args):
# this exists so we can override it during the unit tests
d = utils.getProcessOutput(self.svnbin, args, {})
d = utils.getProcessOutput(self.svnbin, args, self.environ)
return d

def get_root(self):
Expand Down

0 comments on commit b4c5301

Please sign in to comment.