Re: [LyX/master] Fix bug #12466

2022-02-13 Thread Enrico Forestieri
On Sun, Feb 13, 2022 at 09:43:59AM +, José Abílio Matos wrote:
> 
> On Sunday, 13 February 2022 03.30.57 WET Enrico Forestieri wrote:
> > commit 777ccce5617aea9b15f27902b9133146eff4e87b
> > Author: Enrico Forestieri 
> > Date:   Sun Feb 13 04:57:27 2022 +0100
> > 
> > Fix bug #12466
> > 
> > Amend 109ea2be by reintroducing the command prefix that was
> > inadvertently removed. The prefix sets the proper environment
> > for latex.
> 
> Apologies if this was my doing.
> Not only it was not my intention as I tried to avoid all the changes that 
> could had side effects like this. :-(

No need to apologize, José. I was mentioning 109ea2be only to put this
change in context. This was the sequence of changes that lead to the
issue:

== commit f6ca8350cde26c90391e29fad16437f7b3287092 ==
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -303,7 +303,10 @@ int ForkedCall::generateChild()
if (command_.empty())
return 1;
 
-   string const line = cmd_prefix_ + command_;
+   // Make sure that a V2 python is run, if available.
+   string const line = cmd_prefix_ +
+   (prefixIs(command_, "python -tt")
+? os::python() + command_.substr(10) : command_);
 
 #if !defined (_WIN32)
// POSIX
=

== commit 109ea2be4a21ca93d22ab25703b3352a50fbbe3b ==
--- a/src/support/ForkedCalls.cpp
+++ b/src/support/ForkedCalls.cpp
@@ -305,11 +305,6 @@ int ForkedCall::generateChild()
if (command_.empty())
return 1;

-   // Make sure that a V2 python is run, if available.
-   string const line = cmd_prefix_ +
-   (prefixIs(command_, "python -tt")
-? os::python() + command_.substr(10) : command_);
-
 #if !defined (_WIN32)
// POSIX

=

So, 109ea2be was not restoring the previous state.

-- 
Enrico
-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel


Re: [LyX/master] Fix bug #12466

2022-02-13 Thread José Abílio Matos
On Sunday, 13 February 2022 03.30.57 WET Enrico Forestieri wrote:
> commit 777ccce5617aea9b15f27902b9133146eff4e87b
> Author: Enrico Forestieri 
> Date:   Sun Feb 13 04:57:27 2022 +0100
> 
> Fix bug #12466
> 
> Amend 109ea2be by reintroducing the command prefix that was
> inadvertently removed. The prefix sets the proper environment
> for latex.

Apologies if this was my doing.
Not only it was not my intention as I tried to avoid all the changes that 
could had side effects like this. :-(

-- 
José Abílio-- 
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel