Remove job parameter USER that has been replaced by the BatchManager attribute username

diff --git a/src/Core/Constants.cxx b/src/Core/Constants.cxx
index 2968e6f38266e2f79ebfbd42ceeee8e0c1860bc7..602b7257a020b65649b18dd7bf800b97f7e91ff6 100644 (file)
--- a/src/Core/Constants.cxx
+++ b/src/Core/Constants.cxx
@@ -47,7 +47,6 @@ namespace Batch {
   def_Constant(PID);
   def_Constant(QUEUE);
   def_Constant(STATE);
-  def_Constant(USER);
   def_Constant(WORKDIR);
   def_Constant(HOMEDIR);
   def_Constant(EXCLUSIVE);

diff --git a/src/Core/Constants.hxx b/src/Core/Constants.hxx
index 5d16505ebc3acd923c26a47ba7eceea6b3c84e26..648ab0650b80266640cc05165040e187d10593c1 100644 (file)
--- a/src/Core/Constants.hxx
+++ b/src/Core/Constants.hxx
@@ -58,7 +58,6 @@ namespace Batch {
   decl_extern_Constant(PID);
   decl_extern_Constant(QUEUE);
   decl_extern_Constant(STATE);
-  decl_extern_Constant(USER);
   decl_extern_Constant(WORKDIR);
   decl_extern_Constant(HOMEDIR);
   decl_extern_Constant(EXCLUSIVE);

diff --git a/src/Core/ParameterTypeMap.cxx b/src/Core/ParameterTypeMap.cxx
index 60080da83c0494387c8b853dc15578e2b005b326..0622583e68ccd76fea29ff4cb35a0c432b897d31 100644 (file)
--- a/src/Core/ParameterTypeMap.cxx
+++ b/src/Core/ParameterTypeMap.cxx
@@ -60,7 +60,6 @@ namespace Batch {
     addParameter("PID", LONG, 1);
     addParameter("QUEUE", STRING, 1);
     addParameter("STATE", STRING, 1);
-    addParameter("USER", STRING, 1);
     addParameter("WORKDIR", STRING, 1);
     addParameter("HOMEDIR", STRING, 1);
     addParameter("EXCLUSIVE", BOOL, 1);

diff --git a/src/Local/BatchManager_Local.cxx b/src/Local/BatchManager_Local.cxx
index e5ee6726701250274f7033867b59613f74aceb23..fc44883966e8aa10c61b561572f27f42f560edec 100644 (file)
--- a/src/Local/BatchManager_Local.cxx
+++ b/src/Local/BatchManager_Local.cxx
@@ -296,13 +296,7 @@ namespace Batch {
       }
     }
 
-    string user;
-    Parametre::const_iterator it = param.find(USER);
-    if (it != param.end()) {
-      user = string(it->second);
-    }
-
-    return _protocol.getExecCommandArgs(exec_sub_cmd.str(), _hostname, user);
+    return _protocol.getExecCommandArgs(exec_sub_cmd.str(), _hostname, _username);
   }
 
 

diff --git a/src/Local/Test/Test_Local_RSH.cxx b/src/Local/Test/Test_Local_RSH.cxx
index 246638edb5443688c797536244f114747c177caf..25133a86461a94fdc8c71c75258fc7ba49cadc1a 100644 (file)
--- a/src/Local/Test/Test_Local_RSH.cxx
+++ b/src/Local/Test/Test_Local_RSH.cxx
@@ -70,7 +70,6 @@ int main(int argc, char** argv)
     p[INFILE]        = Couple("seta.sh", workdir + "/copied-seta.sh");
     p[INFILE]       += Couple("setb.sh", workdir + "/copied-setb.sh");
     p[OUTFILE]       = Couple("result.txt", workdir + "/orig-result.txt");
-    p[USER]          = user;
     job.setParametre(p);
     // ... and its environment
     Environnement e;

diff --git a/src/Local/Test/Test_Local_SSH.cxx b/src/Local/Test/Test_Local_SSH.cxx
index c99b3f919c5738fc67b7131ebd9fdd8488e61048..82e857dcc1281df1e39da2c51a1d7d6571e032a8 100644 (file)
--- a/src/Local/Test/Test_Local_SSH.cxx
+++ b/src/Local/Test/Test_Local_SSH.cxx
@@ -71,7 +71,6 @@ int main(int argc, char** argv)
     p[INFILE]        = Couple("seta.sh", workdir + "/copied-seta.sh");
     p[INFILE]       += Couple("setb.sh", workdir + "/copied-setb.sh");
     p[OUTFILE]       = Couple("result.txt", workdir + "/orig-result.txt");
-    p[USER]          = user;
     job.setParametre(p);
     // ... and its environment (SSH_AUTH_SOCK env var is important for ssh agent authentication)
     Environnement e;