diff -r 9ae505976dfa -r ffcfcf7cde2c autobuild/common.py --- a/autobuild/common.py Fri Jan 28 16:41:56 2011 -0800 +++ b/autobuild/common.py Sat Jan 29 07:55:49 2011 -0500 @@ -102,8 +102,6 @@ Return the full path to the scp command """ scp = find_executable(['pscp', 'scp'], ['.exe']) - if not scp: - raise AutobuildError("cannot find an appropriate scp or pscp command") return scp def get_default_install_cache_dir(): @@ -411,7 +409,10 @@ if not self._dir: self._dir = tempfile.mkdtemp() local = os.path.join(self._dir, remote.split('/')[-1]) + if not self._scp: + raise AutobuildError("no scp command available; cannot fetch %s" % remote) command = (self._scp, remote, local) + logger.info("using SCP: " + remote) rv = subprocess.call(command) if rv != 0: raise AutobuildError("cannot fetch %s" % remote)