(new launcher only) skip exit command when parsing env files

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index c17880a5b92f97cca4701aab1ad797a78ebc51fd..0baa9927001d3e449bc93ec0b5e1ff185e8ce59c 100755 (executable)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,6 @@ SET(SCRIPTS
 IF(SALOME_USE_PORTMANAGER)
   SET(PORTMANAGER_SCRIPTS
     PortManager.py
-    Singleton.py
     )
   LIST(APPEND SCRIPTS ${PORTMANAGER_SCRIPTS})
 ENDIF()

diff --git a/bin/Singleton.py b/bin/Singleton.py
deleted file mode 100644 (file)
index 0f0f53f..0000000
--- a/bin/Singleton.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-#  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-"""
-The Singleton metaclass is used by each class which must have a unique instance.
-Example:
-class SingleInstanceClass(object):
-  __metaclass__ = Singleton
-  ...
-"""
-class Singleton(type):
-  #
-  def __init(self):
-    super(Singleton, self).__init__()
-  #
-  def __call__(self, *args, **kwargs):
-    try:
-      return self.__instance
-    except AttributeError:
-      self.__instance = super(Singleton, self).__call__(*args, **kwargs)
-      return self.__instance
-  #
-#

diff --git a/bin/parseConfigFile.py b/bin/parseConfigFile.py
index 96754b5d322c6d83882ecd97ab9f956f1115b57a..62932420e34233e92ed3c93a53ae467a02e56ef7 100644 (file)
--- a/bin/parseConfigFile.py
+++ b/bin/parseConfigFile.py
@@ -209,7 +209,7 @@ class EnvFileConverter(object):
     self.outputFile = outputFile
     self.allParsedVariableNames=[]
     # exclude line that begin with:
-    self.exclude = [ 'if', 'then', 'else', 'fi', '#', 'echo' ]
+    self.exclude = [ 'if', 'then', 'else', 'fi', '#', 'echo', 'exit' ]
     self.exclude.append('$gconfTool') # QUICK FIX :TODO: provide method to extend this variable
     # discard the following keywords if at the beginning of line:
     self.discard = [ 'export' ]