9554b557ca07 — Oben Sonne 11 months ago
Merged in frederic_lespez/gnome-encfs (pull request #5)

Newer versions of file command return a different mimetype
1 files changed, 1 insertions(+), 1 deletions(-)

M gnome-encfs
M gnome-encfs +1 -1
@@ 196,7 196,7 @@ def _encfs_env(econfig):
         cmd = ["file", "-b", "--mime-type", econfig]
         p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
         mime_type = p.communicate()[0].strip()
-        v = 6 if mime_type == 'application/xml' else 5
+        v = 6 if mime_type == 'application/xml' or mime_type == 'text/xml' else 5
         env["ENCFS%s_CONFIG" % v] = econfig
     return env