# HG changeset patch # User Oben Sonne # Date 1573220496 0 # Fri Nov 08 13:41:36 2019 +0000 # Node ID 9554b557ca07b347089321b866be075f0b93e7ce # Parent d64acd15b9382a67b128bbfe8576652946cb38d1 # Parent 0d0d490c7e2c281e1cfea1811996c1607c871b4c Merged in frederic_lespez/gnome-encfs (pull request #5) Newer versions of file command return a different mimetype diff --git a/gnome-encfs b/gnome-encfs --- a/gnome-encfs +++ b/gnome-encfs @@ -196,7 +196,7 @@ 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