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 | 6 |
1 files changed, 3 insertions, 3 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 aefa035..b4e8d1b 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 d24ecdaf549c3f35cc3ee32b5af3ccb70b1a45c4 Mon Sep 17 00:00:00 2001 | 1 | From 767399d1d3305cec2aea6b36517e5e74b521e3aa 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,7 +11,7 @@ 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 a4e964d49d..3fee33ff49 100644 | 14 | index 07ed73ec05..712e72f19e 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 | @@ -493,6 +493,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, | 17 | @@ -493,6 +493,7 @@ bool detectRLocationsUsingR(const std::string& rScriptPath, |
| @@ -32,5 +32,5 @@ index a4e964d49d..3fee33ff49 100644 | |||
| 32 | } | 32 | } |
| 33 | #endif | 33 | #endif |
| 34 | -- | 34 | -- |
| 35 | 2.52.0 | 35 | 2.54.0 |
| 36 | 36 | ||
