7258: transcode os.path.join args from the fs enc to prevent a crash

2014-04-04 22:03:51 +02:00
parent 2353c0bd34
commit 26ab379584
3 changed files with 4 additions and 4 deletions
--- a/setup.py
+++ b/setup.py
@ -214,7 +214,7 @@ def merge(in_file, out_file, option, po_dir='po', cache=True):

    if (not os.path.exists(out_file) and os.path.exists(in_file)):
        if sys.platform == 'win32':
-            cmd = (('set LC_ALL=C && intltool-merge %(opt)s %(po_dir)s %(in_file)s '
+            cmd = (('set LC_ALL=C && perl -S intltool-merge %(opt)s %(po_dir)s %(in_file)s '
                '%(out_file)s') % 
              {'opt' : option, 
               'po_dir' : po_dir,