diff options
| author | Chris Lamb <lamby@debian.org> | 2017-07-17 08:35:05 (GMT) |
|---|---|---|
| committer | Chris Lamb <lamby@debian.org> | 2017-07-17 08:38:53 (GMT) |
| commit | 7e16cecb98ec2e874da4f3ea291e276602852dcd (patch) | |
| tree | 3cc23706bb3fdf6a9fda199b5436bac2b25317dc | |
| parent | c12bee5fc718c918d6280102d4dbe688b0a553cf (diff) | |
comparators.Directory: Revert the removal of this try-except. (Closes: #868534)
| -rw-r--r-- | diffoscope/comparators/directory.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/diffoscope/comparators/directory.py b/diffoscope/comparators/directory.py index 2f6289d..5b34a41 100644 --- a/diffoscope/comparators/directory.py +++ b/diffoscope/comparators/directory.py @@ -164,11 +164,14 @@ class FilesystemDirectory(Directory): def compare(self, other, source=None): differences = [] - listing_diff = Difference.from_text('\n'.join(list_files(self.path)), - '\n'.join(list_files(other.path)), - self.path, other.path, source='file list') - if listing_diff: - differences.append(listing_diff) + try: + listing_diff = Difference.from_text('\n'.join(list_files(self.path)), + '\n'.join(list_files(other.path)), + self.path, other.path, source='file list') + if listing_diff: + differences.append(listing_diff) + except RequiredToolNotFound: + logger.info("Unable to find 'getfacl'.") differences.extend(compare_meta(self.name, other.name)) my_container = DirectoryContainer(self) |
