aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2014-10-29 07:46:35 +0100
committerGuido Günther <agx@sigxcpu.org>2014-10-29 07:47:02 +0100
commit3d8939d4514484fd65bf6a84fd7304604924e8f3 (patch)
tree472e898ed4e957e27e38a3547e058d41ddbb6ce3
parente94709baab527ca7a11182cc024a84cff05c8704 (diff)
git.vfs: fix close method
Preventing a infinite recursion which can be triggered by gbp pq export --commit.
-rw-r--r--gbp/git/vfs.py2
-rw-r--r--tests/test_GitVfs.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/gbp/git/vfs.py b/gbp/git/vfs.py
index 81649eb..5d5e132 100644
--- a/gbp/git/vfs.py
+++ b/gbp/git/vfs.py
@@ -41,7 +41,7 @@ class GitVfs(object):
return self._data.read(size)
def close(self):
- return self.close()
+ return self._data.close()
def __init__(self, repo, committish=None):
"""
diff --git a/tests/test_GitVfs.py b/tests/test_GitVfs.py
index 7004db1..8e04954 100644
--- a/tests/test_GitVfs.py
+++ b/tests/test_GitVfs.py
@@ -46,6 +46,7 @@ def test_read():
''
>>> gf.readline()
''
+ >>> gf.close()
>>> gbp.git.vfs.GitVfs(repo, 'HEAD').open('foo.txt').read() == content
True
>>> gf = vfs.open('doesnotexist')