diff options
author | Lars Wirzenius <liw@liw.fi> | 2015-08-20 22:01:45 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2015-08-20 22:01:45 +0200 |
commit | 2a948e45823c2fbbabc1282d8ce7679cfe1e8871 (patch) | |
tree | fa240fa32b2bd19cc12dba604f5783e2a73f39a6 /obnamlib/fmt_ga/client.py | |
parent | 238670afdbbcd6c7e13c801db50c98e68881de54 (diff) | |
download | obnam-2a948e45823c2fbbabc1282d8ce7679cfe1e8871.tar.gz |
Avoid _require_file_exists in get_file_children
Diffstat (limited to 'obnamlib/fmt_ga/client.py')
-rw-r--r-- | obnamlib/fmt_ga/client.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/obnamlib/fmt_ga/client.py b/obnamlib/fmt_ga/client.py index ea90cedb..4895a65a 100644 --- a/obnamlib/fmt_ga/client.py +++ b/obnamlib/fmt_ga/client.py @@ -335,10 +335,15 @@ class GAClient(object): def get_file_children(self, gen_number, filename): self._load_data() - self._require_file_exists(gen_number, filename) generation = self._lookup_generation_by_gen_number(gen_number) metadata = generation.get_file_metadata() - return metadata.get_file_children(filename) + result = metadata.get_file_children(filename) + if result is None: + raise obnamlib.RepositoryFileDoesNotExistInGeneration( + client_name=self._client_name, + genspec=gen_number, + filename=filename) + return result def _is_direct_child_of(self, child, parent): return os.path.dirname(child) == parent and child != parent @@ -688,7 +693,7 @@ class GAFileMetadata(object): files = [x for x in dir_obj.get_file_basenames() if x != '.'] subdirs = dir_obj.get_subdir_basenames() return [os.path.join(dirname, x) for x in files + subdirs] - return [] + return None class AddedFiles(object): |