From 9460712a591118bc1bb923f3ed7f6c251898cc4c Mon Sep 17 00:00:00 2001
From: Gregor Robinson <gregor@fiatflux.co.uk>
Date: Mon, 5 Aug 2013 22:06:46 +0200
Subject: [PATCH 1/2] File permission special case for NTFS-3g on POSIX.

Fix issue #347, "*SensitiveFilePermissions fails on ntfs-3g mounted filesystems".
---
 src/shared.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/shared.py b/src/shared.py
index 214c124f..9b8c9325 100644
--- a/src/shared.py
+++ b/src/shared.py
@@ -346,6 +346,19 @@ def checkSensitiveFilePermissions(filename):
         # Windows systems.
         return True
     else:
+        try:
+            # Skip known problems for non-Win32 filesystems without POSIX permissions.
+            import subprocess
+            fstype = subprocess.check_output('stat -f -c "%%T" %s' % (filename),
+                                             shell=True,
+                                             stderr=subprocess.STDOUT)
+            if 'fuseblk' in fstype:
+                logger.info('Skipping file permissions check for %s. Filesystem fuseblk detected.',
+                            filename)
+                return True
+        except:
+            # Swallow exception here, but we might run into trouble later!
+            logger.error('Could not determine filesystem type.', filename)
         present_permissions = os.stat(filename)[0]
         disallowed_permissions = stat.S_IRWXG | stat.S_IRWXO
         return present_permissions & disallowed_permissions == 0

From 854b7394311172afbb67405d50abeb703aaea234 Mon Sep 17 00:00:00 2001
From: Lucretiel <Lucretiel@gmail.com>
Date: Thu, 8 Aug 2013 03:52:47 -0400
Subject: [PATCH 2/2] The createDefaultKnownNodes function now uses a with
 statement

---
 src/defaultKnownNodes.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/defaultKnownNodes.py b/src/defaultKnownNodes.py
index 52e31fff..d4611099 100644
--- a/src/defaultKnownNodes.py
+++ b/src/defaultKnownNodes.py
@@ -37,12 +37,10 @@ def createDefaultKnownNodes(appdata):
     #print stream1
     #print allKnownNodes
 
-    output = open(appdata + 'knownnodes.dat', 'wb')
+    with open(appdata + 'knownnodes.dat', 'wb) as output:    
+        # Pickle dictionary using protocol 0.
+        pickle.dump(allKnownNodes, output)
 
-    # Pickle dictionary using protocol 0.
-    pickle.dump(allKnownNodes, output)
-
-    output.close()
     return allKnownNodes
 
 def readDefaultKnownNodes(appdata):