From 2e9c8b28466e88bd79d6444598018e0e7ea4c31d Mon Sep 17 00:00:00 2001 From: ribes Date: Thu, 27 Oct 2011 10:03:55 +0000 Subject: [PATCH] Bug Fix: Job file and env file are now not added to input list files --- src/Launcher/Launcher_Job.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx index 5728af45e..77cb72f4e 100644 --- a/src/Launcher/Launcher_Job.cxx +++ b/src/Launcher/Launcher_Job.cxx @@ -205,9 +205,6 @@ Launcher::Job::setJobFile(const std::string & job_file) std::string::size_type p2 = _job_file.find_last_of("."); _job_file_name_complete = _job_file.substr(p1+1); _job_file_name = _job_file.substr(p1+1,p2-p1-1); - - if (_job_file != "") - add_in_file(_job_file); } std::string @@ -219,8 +216,6 @@ void Launcher::Job::setEnvFile(const std::string & env_file) { _env_file = env_file; - if (_env_file != "") - add_in_file(_env_file); } std::string @@ -491,7 +486,11 @@ Launcher::Job::common_job_params() _result_directory = getenv("HOME"); // _in_files - for(std::list::iterator it = _in_files.begin(); it != _in_files.end(); it++) + std::list in_files(_in_files); + in_files.push_back(_job_file); + if (_env_file != "") + in_files.push_back(_env_file); + for(std::list::iterator it = in_files.begin(); it != in_files.end(); it++) { std::string file = *it; @@ -502,7 +501,7 @@ Launcher::Job::common_job_params() else local_file = _local_directory + "/" + file; - // remote file -> get only file name from _in_files + // remote file -> get only file name from in_files size_t found = file.find_last_of("/"); std::string remote_file = _work_directory + "/" + file.substr(found+1); -- 2.39.2