Merge branch 'master' of ssh://git-rw.torproject.org/user/jvoisin/mat

1 files changed, 13 insertions, 3 deletions

diff --git a/mat/mat.py b/mat/mat.py
index 343d9d5..08112ae 100644
--- a/mat/mat.py
+++ b/mat/mat.py
@@ -108,7 +108,17 @@ def create_class_file(name, backup, add2archive):
     if not os.path.isfile(name):
         # check if the file exists
         logging.error('%s is not a valid file' % name)
-        return
+        return False
+
+    if not os.access(name, os.R_OK):
+        #check read permissions
+        logging.error('%s is is not readable' % name)
+        return False
+
+    if not os.access(name, os.W_OK):
+        #check write permission
+        logging.error('%s is not writtable' % name)
+        return False
 
     filename = ''
     try:
@@ -119,7 +129,7 @@ def create_class_file(name, backup, add2archive):
     parser = hachoir_parser.createParser(filename)
     if not parser:
         logging.info('Unable to parse %s' % filename)
-        return
+        return False
 
     mime = parser.mime_type
 
@@ -135,6 +145,6 @@ def create_class_file(name, backup, add2archive):
         stripper_class = strippers.STRIPPERS[mime]
     except KeyError:
         logging.info('Don\'t have stripper for %s format' % mime)
-        return
+        return False
 
     return stripper_class(filename, parser, mime, backup, add2archive)