diff --git a/seash_helper.py b/seash_helper.py index 00d7f4b..19e47da 100644 --- a/seash_helper.py +++ b/seash_helper.py @@ -608,32 +608,22 @@ def reset_target(longname): - def run_target(longname, filename, filedata, argstring, prog_platform): - + vesselname = seash_global_variables.vesselinfo[longname]['vesselname'] - + try: nmclient.nmclient_signedsay(seash_global_variables.vesselinfo[longname]['handle'], "AddFileToVessel", vesselname, filename, filedata) - # Backwards compatibility with old nodemanagers that don't support - # StartVesselEX - if prog_platform == "repyV1": - nmclient.nmclient_signedsay( - seash_global_variables.vesselinfo[longname]['handle'], - "StartVessel", vesselname, argstring) - else: - nmclient.nmclient_signedsay( - seash_global_variables.vesselinfo[longname]['handle'], - "StartVesselEx", vesselname, prog_platform, argstring) - - except nmclient.NMClientException, e: + (status,str_e) = start_target(longname, argstring, prog_platform) + if status is False: + return(False, str(str_e)) + + except nmclient.NMClientException,e: return (False, str(e)) - + else: return (True,) - - # didn't test... def split_target(longname, resourcedata):