From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 12 Sep 2017 05:57:29 +0000 (+0200)
Subject: svg2*tex.py: final fixes for Windows
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~4562
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5de0bf55a7736add7056db46bb906051ed32f4f5;p=features.git

svg2*tex.py: final fixes for Windows

Fixes: #10679
---

diff --git a/lib/scripts/svg2pdftex.py b/lib/scripts/svg2pdftex.py
index 56ac22edd4..c574e6a1a4 100644
--- a/lib/scripts/svg2pdftex.py
+++ b/lib/scripts/svg2pdftex.py
@@ -33,8 +33,9 @@ def runCommand(cmd):
     ''' Utility function:
         run a command, quit if fails
     '''
-    if subprocess.call(cmd) != 0:
-        print "Command '%s' fails." % cmd
+    res = subprocess.check_call(cmd)
+    if res != 0:
+        print "Command '%s' fails (exit code: %i)." % (res.cmd, res.returncode)
         sys.exit(1)
 
 InkscapeCmd = "inkscape"
@@ -65,7 +66,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.pdf_tex which includes and overlays
 # the PDF image and can be \input to LaTeX files. We rename the latter file to ${OutputFile}
 # (although this is probably the name it already has).
-runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-pdf=%s.pdf' % (OutBase), '--export-latex'])
+runCommand([r'%s' % InkscapeCmd, '--file=%s' % InputFile, '--export-pdf=%s.pdf' % OutBase, '--export-latex'])
 
 os.rename('%s.pdf_tex' % OutBase, OutputFile)
 
diff --git a/lib/scripts/svg2pstex.py b/lib/scripts/svg2pstex.py
index 246537b6ec..0195e26d2f 100644
--- a/lib/scripts/svg2pstex.py
+++ b/lib/scripts/svg2pstex.py
@@ -36,8 +36,9 @@ def runCommand(cmd):
     ''' Utility function:
         run a command, quit if fails
     '''
-    if subprocess.call(cmd) != 0:
-        print "Command '%s' fails." % cmd
+    res = subprocess.check_call(cmd)
+    if res != 0:
+        print "Command '%s' fails (exit code: %i)." % (res.cmd, res.returncode)
         sys.exit(1)
 
 InkscapeCmd = "inkscape"
@@ -68,7 +69,7 @@ OutBase = os.path.splitext(OutputFile)[0]
 # while outsourcing the text to a LaTeX file ${OutBase}.eps_tex which includes and overlays
 # the EPS image and can be \input to LaTeX files. We rename the latter file to ${OutputFile}
 # (although this is probably the name it already has).
-runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-eps=%s.eps' % (OutBase), '--export-latex'])
+runCommand([r'%s' % InkscapeCmd, '--file=%s' % InputFile, '--export-eps=%s.eps' % OutBase, '--export-latex'])
 
 os.rename('%s.eps_tex' % OutBase, OutputFile)