From ab67ce3757d76ab4df718f3f085b42420922e480 Mon Sep 17 00:00:00 2001 From: Scott Kostyshak Date: Wed, 4 Jun 2014 13:52:42 -0400 Subject: [PATCH] Fix a regression reported at #9146 This regression was introduced by me at 8b66f9ce. I did not take into account that a call to a python script containing $$s is embedded within a separate python script. Thus, when commandPrep() is called it only sees the call to the outer python script, and does not see the $$s contained in that python script. It therefore did not substitute for it. This fix simply calls commandPrep() directly before writing the embedded command. --- src/graphics/GraphicsConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp index 98580bd1eb..263c91eab9 100644 --- a/src/graphics/GraphicsConverter.cpp +++ b/src/graphics/GraphicsConverter.cpp @@ -324,7 +324,7 @@ static void build_script(string const & from_file, ostringstream os; os << os::python() << ' ' - << "$$s/scripts/convertDefault.py" << ' '; + << commandPrep("$$s/scripts/convertDefault.py") << ' '; if (!from_format.empty()) os << strip_digit(from_format) << ':'; // The extra " quotes around infile and outfile are needed -- 2.39.2