diff options
-rwxr-xr-x | lorry | 8 | ||||
-rwxr-xr-x | lorry-ssh-wrapper | 5 | ||||
-rw-r--r-- | setup.py | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -431,8 +431,12 @@ class Lorry(cliapp.Application): def gitify_cvs(self, project_name, dirname, gitdir, spec): self.needs_aggressive = True - self.run_program(['git', 'cvsimport', '-a', '-d', spec['url'], - '-C', gitdir, spec['module']]) + env = dict(os.environ) + env['CVS_RSH'] = 'lorry-ssh-wrapper' + self.run_program( + ['git', 'cvsimport', '-a', '-d', spec['url'], + '-C', gitdir, spec['module']], + env=env) def gitify_hg(self, project_name, dirname, gitdir, spec): hgdir = os.path.join(dirname, 'hg') diff --git a/lorry-ssh-wrapper b/lorry-ssh-wrapper new file mode 100755 index 0000000..c4e2c1d --- /dev/null +++ b/lorry-ssh-wrapper @@ -0,0 +1,5 @@ +#!/bin/sh +# Run ssh without strict host key checking. + +set -eu +exec ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "$@" @@ -85,7 +85,7 @@ FIXME author='Baserock', author_email='baserock-dev@baserock.org', url='http://wiki.baserock.org/', - scripts=['lorry', 'lorry.tar-importer'], + scripts=['lorry', 'lorry.tar-importer', 'lorry-ssh-wrapper'], data_files=[('share/man/man1', glob.glob('*.[1-8]'))], cmdclass={ 'build': GenerateManpage, |