summaryrefslogtreecommitdiff
path: root/lib/archive.py
diff options
context:
space:
mode:
authorjvoisin2011-07-26 04:55:59 +0200
committerjvoisin2011-07-26 04:55:59 +0200
commitf6e3d57173604dab7228c830e84415ead02e169b (patch)
treec38b5e2f09b6aebff79a6786ce8d26d05c7c5845 /lib/archive.py
parent342cbf4bd69e638f62319ea0e6660af5dc717131 (diff)
Tests are green for opendocument format
Diffstat (limited to 'lib/archive.py')
-rw-r--r--lib/archive.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/archive.py b/lib/archive.py
index 8a8f7f4..f22af39 100644
--- a/lib/archive.py
+++ b/lib/archive.py
@@ -69,10 +69,13 @@ class ZipStripper(GenericArchiveStripper):
69 return False 69 return False
70 except: 70 except:
71 #best solution I have found 71 #best solution I have found
72 logging.error('%s is not supported' % item.filename) 72 logging.info('%s\'s fileformat is not supported, or is a \
73 _, ext = os.path.splitext(name) 73harmless format' % item.filename)
74 base, ext = os.path.splitext(name)
75 bname = os.path.basename(item.filename)
74 if ext not in parser.NOMETA: 76 if ext not in parser.NOMETA:
75 return False 77 if bname != 'mimetype':
78 return False
76 mat.secure_remove(name) 79 mat.secure_remove(name)
77 zipin.close() 80 zipin.close()
78 return True 81 return True