From 6a7ec826768bf7961254c101ca4e51ef41dd6df3 Mon Sep 17 00:00:00 2001
From: intrigeri
Date: Sat, 25 Jul 2015 14:16:59 +0000
Subject: ExiftoolStripper: white-list the "File Type Extension" and
 "Megapixels" fields.

Those are not actual metadata stored in the file, but rather information that
can be trivially derived from the actual data.

This fixes the test suite on current Debian sid, most likely because its
libimage-exiftool-perl (9.98-1) reports more such "metadata" fields than the one
in Jessie (9.74-1).

Fix-committed: #9252
Closes: Debian#789833
---
 libmat/exiftool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libmat/exiftool.py')

diff --git a/libmat/exiftool.py b/libmat/exiftool.py
index 3efd4f2..aa6849d 100644
--- a/libmat/exiftool.py
+++ b/libmat/exiftool.py
@@ -14,8 +14,8 @@ class ExiftoolStripper(parser.GenericParser):
         super(ExiftoolStripper, self).__init__(filename, parser, mime, backup, is_writable, **kwargs)
         self.allowed = set(['ExifTool Version Number', 'File Name', 'Directory',
                 'File Size', 'File Modification Date/Time', 'File Access Date/Time', 'File Permissions',
-                'File Type', 'MIME Type', 'Image Width', 'Image Height',
-                'Image Size', 'File Inode Change Date/Time'])
+                'File Type', 'File Type Extension', 'MIME Type', 'Image Width', 'Image Height',
+                'Image Size', 'File Inode Change Date/Time', 'Megapixels'])
         self._set_allowed()
 
     def _set_allowed(self):
-- 
cgit v1.3