[Fontconfig] fontconfig: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Feb 15 12:39:19 UTC 2021


 conf.d/link_confs.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7bfbaecf819a8b1630dfc8f56126e31f985d5fb3
Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Fri Jan 29 19:17:38 2021 -0500

    Windows: Fix symlink privilege error detection
    
    The message is in e.args[1] and not e.args[0] at least with python 3.8.
    Should be more future proof like this in case it change again.

diff --git a/conf.d/link_confs.py b/conf.d/link_confs.py
index 0c42efb..5a78d8d 100644
--- a/conf.d/link_confs.py
+++ b/conf.d/link_confs.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import argparse
+import platform
 
 if __name__=='__main__':
     parser = argparse.ArgumentParser()
@@ -26,7 +27,7 @@ if __name__=='__main__':
             break
         except OSError as e:
             # Symlink privileges are not available
-            if len(e.args) == 1 and 'privilege' in e.args[0]:
+            if platform.system().lower() == 'windows' and e.winerror == 1314:
                 break
             raise
         except FileExistsError:


More information about the Fontconfig mailing list