From 6eef4999719a070e38ce5cc558dab7a381b4646c Mon Sep 17 00:00:00 2001
From: Mathieu Doucet <doucetm@ornl.gov>
Date: Wed, 29 Sep 2010 21:22:51 +0000
Subject: [PATCH] Added trailing slash to release dir in ConfigService. Adding
it to MANTIDPATH is both non-standard and makes other parts of the code
break. Re #1594
---
Code/Mantid/Kernel/src/ConfigService.cpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/Kernel/src/ConfigService.cpp b/Code/Mantid/Kernel/src/ConfigService.cpp
index a891b8003a5..f657f1c0cb0 100644
--- a/Code/Mantid/Kernel/src/ConfigService.cpp
+++ b/Code/Mantid/Kernel/src/ConfigService.cpp
@@ -141,7 +141,11 @@ ConfigServiceImpl::ConfigServiceImpl() :
!= std::string::npos)
{
if (Poco::Environment::has("MANTIDPATH"))
- m_strBaseDir = Poco::Environment::get("MANTIDPATH");
+ {
+ // Here we have to follow the convention of the rest of this code and add a trailing slash.
+ // Note: adding it to the MANTIDPATH itself will make other parts of the code crash.
+ m_strBaseDir = Poco::Environment::get("MANTIDPATH") + "/";
+ }
else
m_strBaseDir = Poco::Path::current();
}
--
GitLab