From 56c998be0c5f9d5eb2febf16cc261bb1be4ec2bb Mon Sep 17 00:00:00 2001 From: Jonathan Giszczak Date: Mon, 4 Dec 2017 18:27:40 -0600 Subject: [PATCH 1/3] Remove shadowed variable in launcher. --- programs/launcher/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/launcher/main.cpp b/programs/launcher/main.cpp index 0568fd04ca4..3f22fe260a5 100644 --- a/programs/launcher/main.cpp +++ b/programs/launcher/main.cpp @@ -458,8 +458,8 @@ launcher_def::initialize (const variables_map &vmap) { if (prod_nodes > total_nodes) total_nodes = prod_nodes; - char * erd = getenv ("EOS_ROOT_DIR"); - if (erd == 0) { + erd = getenv ("EOS_ROOT_DIR"); + if (erd.empty()) { erd = getenv ("PWD"); } stage = bf::path(erd); From c390973ab127a8f31e9a0281d14f745cc82f3279 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Tue, 5 Dec 2017 13:53:17 -0600 Subject: [PATCH 2/3] STAT 250 - Removed end of string character that causes nohup process to not identify ampersand at end of command. --- programs/launcher/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/launcher/main.cpp b/programs/launcher/main.cpp index 3f22fe260a5..f7d89ee25b9 100644 --- a/programs/launcher/main.cpp +++ b/programs/launcher/main.cpp @@ -420,7 +420,7 @@ launcher_def::initialize (const variables_map &vmap) { system_clock::time_point now = system_clock::now(); std::time_t now_c = system_clock::to_time_t(now); ostringstream dstrm; - dstrm << std::put_time(std::localtime(&now_c), "%Y_%m_%d_%H_%M_%S") << ends; + dstrm << std::put_time(std::localtime(&now_c), "%Y_%m_%d_%H_%M_%S"); launch_time = dstrm.str(); if ( ! (shape.empty() || From fe2ae2948500036f916aacf99aa52005cb4321b6 Mon Sep 17 00:00:00 2001 From: Brian Johnson Date: Wed, 6 Dec 2017 09:31:35 -0600 Subject: [PATCH 3/3] Fixed handling for getenv returning nullptr. --- programs/launcher/main.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/launcher/main.cpp b/programs/launcher/main.cpp index f7d89ee25b9..5f2e389872a 100644 --- a/programs/launcher/main.cpp +++ b/programs/launcher/main.cpp @@ -458,10 +458,17 @@ launcher_def::initialize (const variables_map &vmap) { if (prod_nodes > total_nodes) total_nodes = prod_nodes; - erd = getenv ("EOS_ROOT_DIR"); - if (erd.empty()) { - erd = getenv ("PWD"); + char* erd_env_var = getenv ("EOS_ROOT_DIR"); + if (erd_env_var == nullptr || std::string(erd_env_var).empty()) { + erd_env_var = getenv ("PWD"); } + + if (erd_env_var != nullptr) { + erd = erd_env_var; + } else { + erd.clear(); + } + stage = bf::path(erd); if (!bf::exists(stage)) { cerr << erd << " is not a valid path" << endl;