From 1775e8747c6902e3e884a52e28bdba895a120e83 Mon Sep 17 00:00:00 2001 From: barate Date: Tue, 6 Aug 2013 12:14:25 +0000 Subject: [PATCH] Remove distinction between batch managers ssh_batch and none --- src/engine/BL_SALOMEServices.cxx | 2 +- src/genericgui/JM_EditSalomeResource.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx index 1b579e5..0eb772e 100644 --- a/src/engine/BL_SALOMEServices.cxx +++ b/src/engine/BL_SALOMEServices.cxx @@ -179,7 +179,7 @@ BL::SALOMEServices::addResource(BL::ResourceDescr & new_resource) resource_definition->name = CORBA::string_dup(new_resource.name.c_str()); resource_definition->hostname = CORBA::string_dup(new_resource.hostname.c_str()); - if (new_resource.batch == "ssh_batch") + if (new_resource.batch == "none") resource_definition->type = CORBA::string_dup("single_machine"); else resource_definition->type = CORBA::string_dup("cluster"); diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx index 1bf0f8a..f026149 100644 --- a/src/genericgui/JM_EditSalomeResource.cxx +++ b/src/genericgui/JM_EditSalomeResource.cxx @@ -131,7 +131,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices * QLabel * batch_label = new QLabel("Batch Manager:"); _batch_line = new QComboBox(this); - _batch_line->addItem("None", "ssh_batch"); + _batch_line->addItem("None", "none"); _batch_line->addItem("CCC", "ccc"); _batch_line->addItem("LSF", "lsf"); _batch_line->addItem("SGE", "sge"); -- 2.30.2