guilhem_lavaux/vide_public
0
0
Fork 0
mirror of https://bitbucket.org/cosmicvoids/vide_public.git synced 2025-07-05 07:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged both mine and nico's fix

Browse source
This commit is contained in:
P.M. Sutter 2012-11-16 09:59:21 -06:00
commit 7c3d7a9d31
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_tools/void_python_tools/backend/launchers.py
View file

@ -297,8 +297,12 @@ def launchPrune(sample, binPath, thisDataPortion=None,
cmd += " >& " + logFile cmd += " >& " + logFile
os.system(cmd) os.system(cmd)
<<<<<<< HEAD
if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or \ if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or \
jobSuccessful(logFile, "Done!"): jobSuccessful(logFile, "Done!"):
=======
if jobSuccessful(logFile, "NetCDF: Not a valid ID\n") or jobSuccessful(logFile, "Done!\n"):
>>>>>>> 3d6fae9882fde44515a59e1144646d77bbd1a124
print "done" print "done"
else: else:
print "FAILED!" print "FAILED!"