diff options
author | Lars Wirzenius <liw@liw.fi> | 2014-01-09 10:51:58 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2014-01-09 10:51:58 +0000 |
commit | 93c5630c2f952404a9b22d628cf18eedc88595b7 (patch) | |
tree | 49e46780d78b122d71429a9ce2733af0f564b5df | |
parent | 8c0403357c5015ce6700c0bf24bffa6a06af7dd3 (diff) | |
download | obnam-93c5630c2f952404a9b22d628cf18eedc88595b7.tar.gz |
Make has_chunk handle in-tree data in fmt 6
-rw-r--r-- | obnamlib/fmt_6/repo_fmt_6.py | 9 | ||||
-rw-r--r-- | test-gpghome/random_seed | bin | 600 -> 600 bytes |
2 files changed, 7 insertions, 2 deletions
diff --git a/obnamlib/fmt_6/repo_fmt_6.py b/obnamlib/fmt_6/repo_fmt_6.py index 483f5510..f3dfca21 100644 --- a/obnamlib/fmt_6/repo_fmt_6.py +++ b/obnamlib/fmt_6/repo_fmt_6.py @@ -613,8 +613,13 @@ class RepositoryFormat6(obnamlib.RepositoryInterface): raise # pragma: no cover def has_chunk(self, chunk_id): - # FIXME: This should interpret a constructed chunk id for - # in-tree data. + if self._is_in_tree_chunk_id(chunk_id): # pragma: no cover + gen_id, filename = self._unpack_in_tree_chunk_id(chunk_id) + client_name, gen_number = gen_id + client = self._open_client(client_name) + data = client.get_file_data(gen_number, filename) + return data is not None + return self._fs.exists(self._chunk_filename(chunk_id)) def remove_chunk(self, chunk_id): diff --git a/test-gpghome/random_seed b/test-gpghome/random_seed Binary files differindex fbcebbe5..6c3f20e0 100644 --- a/test-gpghome/random_seed +++ b/test-gpghome/random_seed |