diff options
Diffstat (limited to 'patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch')
| -rw-r--r-- | patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch index 96eb6aa..7f61e9c 100644 --- a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch +++ b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 36ed7d1c0036d40798a3ab5045f365e8e33692f3 Mon Sep 17 00:00:00 2001 | 1 | From 4834bd54840c7df650b10222597f06a312ce24c6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ricardo Wurmus <rekado@elephly.net> | 2 | From: Ricardo Wurmus <rekado@elephly.net> |
| 3 | Date: Sun, 20 Dec 2020 14:49:51 +0100 | 3 | Date: Sun, 20 Dec 2020 14:49:51 +0100 |
| 4 | Subject: [PATCH 7/7] detectRLocationsUsingR: Restore R_HOME at the end. | 4 | Subject: [PATCH 7/7] detectRLocationsUsingR: Restore R_HOME at the end. |
| @@ -11,10 +11,10 @@ process is calling it, and its R_HOME may not be unset. | |||
| 11 | 1 file changed, 3 insertions(+) | 11 | 1 file changed, 3 insertions(+) |
| 12 | 12 | ||
| 13 | diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp | 13 | diff --git a/src/cpp/core/r_util/REnvironmentPosix.cpp b/src/cpp/core/r_util/REnvironmentPosix.cpp |
| 14 | index 83b60d7a1b..a909631e25 100644 | 14 | index dbc9a9a1af..8ec66fd840 100644 |
| 15 | --- a/src/cpp/core/r_util/REnvironmentPosix.cpp | 15 | --- a/src/cpp/core/r_util/REnvironmentPosix.cpp |
| 16 | +++ b/src/cpp/core/r_util/REnvironmentPosix.cpp | 16 | +++ b/src/cpp/core/r_util/REnvironmentPosix.cpp |
| 17 | @@ -489,6 +489,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, | 17 | @@ -492,6 +492,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, |
| 18 | // (the normal semantics of invoking the R script are that it overwrites | 18 | // (the normal semantics of invoking the R script are that it overwrites |
| 19 | // R_HOME and prints a warning -- this warning is co-mingled with the | 19 | // R_HOME and prints a warning -- this warning is co-mingled with the |
| 20 | // output of R and messes up our parsing) | 20 | // output of R and messes up our parsing) |
| @@ -22,7 +22,7 @@ index 83b60d7a1b..a909631e25 100644 | |||
| 22 | core::system::setenv("R_HOME", ""); | 22 | core::system::setenv("R_HOME", ""); |
| 23 | 23 | ||
| 24 | // if no R path was specified for a module, the module binary path MUST be specified | 24 | // if no R path was specified for a module, the module binary path MUST be specified |
| 25 | @@ -598,6 +599,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, | 25 | @@ -601,6 +602,8 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, |
| 26 | return false; | 26 | return false; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| @@ -32,5 +32,5 @@ index 83b60d7a1b..a909631e25 100644 | |||
| 32 | } | 32 | } |
| 33 | #endif | 33 | #endif |
| 34 | -- | 34 | -- |
| 35 | 2.31.1 | 35 | 2.33.0 |
| 36 | 36 | ||
