Merge remote-tracking branch 'origin/master'

diff --git a/bin/appliskel/salome b/bin/appliskel/salome
index 3bd95d620358848b8f3421dd74db4fe8e579cb42..e397ba801abe419de1e4f4f770122855019f4ccb 100755 (executable)
--- a/bin/appliskel/salome
+++ b/bin/appliskel/salome
@@ -20,7 +20,7 @@ def main(args):
         env_modules_option += "%s" % ','.join(env_modules)
         args.append(env_modules_option)
 
-    appliPath = os.path.realpath(os.path.dirname(os.path.abspath(__file__)))
+    appliPath = os.path.dirname(os.path.realpath(__file__))
     proc = subprocess.Popen([os.path.join(appliPath, '.salome_run')] + args, close_fds=True)
     out, err = proc.communicate()
     sys.exit(proc.returncode)

diff --git a/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx b/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
index 2010d89ef5aa0c12948fd3ac13b8f313758c4da1..c0a06f2a1eb5641e4dfb412d9f7c4771ee804f53 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
+++ b/src/SALOMESDS/SALOMESDS_DataScopeServer.cxx
@@ -744,7 +744,7 @@ void DataScopeServerTransaction::notifyKey(const std::string& varName, PyObject
           continue;
         }
       PyObject *waitKey((*it)->getKeyPyObj());
-      PyObject *meth(PyObject_GetAttrString(keyObj,"__eq__"));
+      PyObject *meth(PyObject_GetAttrString(waitKey,"__eq__"));
       if(!meth)
       {
          std::ostringstream oss; oss << "DataScopeServerTransaction::pingKey : for object id #" << ii << " no __eq__ in pyobj !";