[Reproducible-commits] [diffoscope] 02/05: Also protect	mimedb_encoding by a lock
    Joachim Breitner 
    nomeata at moszumanska.debian.org
       
    Thu Dec  3 12:19:19 UTC 2015
    
    
  
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch pu/parallel2
in repository diffoscope.
commit 17d1abac9406f686a2afe51e61fac1525c1761f8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Dec 3 12:29:39 2015 +0100
    Also protect mimedb_encoding by a lock
---
 diffoscope/comparators/binary.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/diffoscope/comparators/binary.py b/diffoscope/comparators/binary.py
index 345dfc5..3b57526 100644
--- a/diffoscope/comparators/binary.py
+++ b/diffoscope/comparators/binary.py
@@ -79,7 +79,12 @@ class File(object, metaclass=ABCMeta):
             if not hasattr(self, '_mimedb_encoding'):
                 self._mimedb_encoding = magic.open(magic.MAGIC_MIME_ENCODING)
                 self._mimedb_encoding.load()
-            return self._mimedb_encoding.file(path)
+                self._mimedb_encoding_lock = Lock()
+            self._mimedb_encoding_lock.acquire()
+            encoding = self._mimedb_encoding.file(path)
+            self._mimedb_encoding_lock.release()
+            return encoding
+
     else: # use python-magic
         @classmethod
         def guess_file_type(self, path):
-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
    
    
More information about the Reproducible-commits
mailing list