summaryrefslogtreecommitdiff
path: root/lorry
diff options
context:
space:
mode:
authorBen Hutchings <ben.hutchings@codethink.co.uk>2020-09-17 00:07:33 +0100
committerBen Hutchings <ben.hutchings@codethink.co.uk>2020-09-17 02:50:26 +0100
commit2468e2b22c400343d665bba3ea8554fef024affc (patch)
tree114e1649dc53d073fe5044c5c5f79ab42448f56b /lorry
parent37f629385d9acb49061700932c237c038433a2e3 (diff)
downloadlorry-2468e2b22c400343d665bba3ea8554fef024affc.tar.gz
lorry: Make cvsps store cache inside working git repository
git cvsimport uses cvsps, which creates state files under ~/.cvsps. This means the cache may become inconsistent with the git repository. I observed this to happen when adding a second test case for cvs conversion. Set $HOME to the git directory so that this doesn't happen.
Diffstat (limited to 'lorry')
-rwxr-xr-xlorry1
1 files changed, 1 insertions, 0 deletions
diff --git a/lorry b/lorry
index 524ed2c..a3b42e0 100755
--- a/lorry
+++ b/lorry
@@ -680,6 +680,7 @@ class Lorry(cliapp.Application):
env = dict(os.environ)
env['CVS_RSH'] = 'lorry-ssh-wrapper'
env['GIT_DIR'] = gitdir
+ env['HOME'] = gitdir # make cvsps store cache under git dir
self.run_program(
['git', 'cvsimport', '-a', '-d', spec['url'],
'-i', spec['module']],