Changeset 27c5f3e

Timestamp:

Oct 25, 2013 1:42:26 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

f725eda

Parents:

5afcc33

Message:

Properly deal with parse failures locally

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1884 +1884 @@
             # must be writable by the fedd user.  Doing this in the
             # temporary subdir ensures this is the case.
-            tclparser = Popen(tclcmd, stdout=PIPE, close_fds=True, 
+            tclparser = Popen(tclcmd, stdout=PIPE, stderr=PIPE, close_fds=True, 
                     cwd=tmpdir)
-            split_data = tclparser.stdout
-
-            top = topdl.topology_from_xml(file=split_data, top="experiment")
+            split_data, err_data = tclparser.communicate()
+
+            if tclparser.returncode != 0:
+                os.remove(tclfile)
+                raise service_error(service_error.req, 
+                        "Cannot parse input ns2: %s" % err_data)
+
+            top = topdl.topology_from_xml(string=split_data, top="experiment")
             os.remove(tclfile)