From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Sun, 19 May 2013 19:45:36 +0000 (+0200)
Subject: Minor typos
X-Git-Tag: nepi-3.0.0~122^2~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2a915786e4a6fae96f74878746e61f36aae9ff4b;p=nepi.git

Minor typos
---

diff --git a/examples/linux/ccnx/simple_topo.py b/examples/linux/ccnx/simple_topo.py
index 031a5299..65faf715 100644
--- a/examples/linux/ccnx/simple_topo.py
+++ b/examples/linux/ccnx/simple_topo.py
@@ -55,6 +55,7 @@ def add_ccnd(ec, os_type, peers):
 
     env = "PATH=$PATH:${EXP_HOME}/ccnx/bin"
 
+    # BASH command -> ' ccndstart 2>&1 ; ccndc add ccnx:/ udp  host ;  ccnr 2>&1 '
     command = "ccndstart 2>&1 ; "
     peers = map(lambda peer: "ccndc add ccnx:/ udp  %s" % peer, peers)
     command += " ; ".join(peers) + " ; "
diff --git a/src/neco/execution/ec.py b/src/neco/execution/ec.py
index 1d253347..26f0cd47 100644
--- a/src/neco/execution/ec.py
+++ b/src/neco/execution/ec.py
@@ -273,7 +273,7 @@ class ExperimentController(object):
                 rm.deploy()
                 rm.start_with_conditions()
 
-                # Only if the RM has STOP consitions we
+                # Only if the RM has STOP conditions we
                 # schedule a stop. Otherwise the RM will stop immediately
                 if rm.conditions.get(ResourceAction.STOP):
                     rm.stop_with_conditions()
diff --git a/src/neco/execution/resource.py b/src/neco/execution/resource.py
index 762e80e8..a7e7758f 100644
--- a/src/neco/execution/resource.py
+++ b/src/neco/execution/resource.py
@@ -569,7 +569,7 @@ def populate_factory():
         ResourceFactory.register_type(rclass)
 
 def find_types():
-    search_path = os.environ.get("NECO_SEARCH_PATH", "")
+    search_path = os.environ.get("NEPI_SEARCH_PATH", "")
     search_path = set(search_path.split(" "))
    
     import neco.resources 
diff --git a/src/neco/resources/linux/application.py b/src/neco/resources/linux/application.py
index e7a34d58..882fb4c3 100644
--- a/src/neco/resources/linux/application.py
+++ b/src/neco/resources/linux/application.py
@@ -386,24 +386,24 @@ class LinuxApplication(ResourceManager):
             if not self.pid or not self.ppid:
                 failed = True
  
-        (out, chkerr), proc = self.node.check_output(self.app_home, 'stderr')
+            (out, chkerr), proc = self.node.check_output(self.app_home, 'stderr')
 
-        if failed or out or chkerr:
-            # check if execution errors occurred
-            msg = " Failed to start command '%s' " % command
-            out = out
-            if err:
-                err = err
-            elif chkerr:
-                err = chkerr
+            if failed or out or chkerr:
+                # check if execution errors occurred
+                msg = " Failed to start command '%s' " % command
+                out = out
+                if err:
+                    err = err
+                elif chkerr:
+                    err = chkerr
 
-            self.error(msg, out, err)
+                self.error(msg, out, err)
 
-            msg2 = " Setting state to Failed"
-            self.debug(msg2)
-            self._state = ResourceState.FAILED
+                msg2 = " Setting state to Failed"
+                self.debug(msg2)
+                self._state = ResourceState.FAILED
 
-            raise RuntimeError, msg
+                raise RuntimeError, msg
 
     def stop(self):
         command = self.get('command') or ''
diff --git a/src/neco/resources/linux/node.py b/src/neco/resources/linux/node.py
index 237399e2..3f306338 100644
--- a/src/neco/resources/linux/node.py
+++ b/src/neco/resources/linux/node.py
@@ -413,6 +413,7 @@ class LinuxNode(ResourceManager):
 
         out = err = ""
         try:
+            # TODO: FIX NOT ALIVE!!!!
             (out, err), proc = self.execute("echo 'ALIVE' || (echo 'NOTALIVE') >&2", retry = 5, 
                     with_lock = True)
         except: