Commit 99b688bb authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Removed PYTHONPATH modifications from run_at_geoms__deployed.py. Bugfix for...

Removed PYTHONPATH modifications from run_at_geoms__deployed.py. Bugfix for OSError connected with .fuse_hidden files.


Former-commit-id: 2e8cef2a
parent 17927a94
...@@ -15,13 +15,6 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH} ...@@ -15,13 +15,6 @@ export LD_LIBRARY_PATH=${LD_PATH_PYTHON_GFZ}:${LD_LIBRARY_PATH}
export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here! export PYTHONPATH=${PFX}/opt/lib/python3.6/site-packages:${PFX}/opt/lib/python2.7/site-packages # Python version must be updated here!
export GDAL_DATA=${PFX}/opt/share/gdal export GDAL_DATA=${PFX}/opt/share/gdal
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/gms_preprocessing # needed to find gms_preprocessing
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/geoarray # needed to find geoarray
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/py_tools_ds # needed to find py_tools_ds
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/scheffler/python_deployed/arosics # needed to find e.g. AROSICS
export PYTHONPATH=${PYTHONPATH}:/home/gfz-fe/hollstein/python/sicor # needed to find sicor
# execute python script # execute python script
#ipython --colors='NoColor' run_gms.py jobid "$@" # NoColor must be active for ipython because gwt-log cannot interpret ANSI console colors #ipython --colors='NoColor' run_gms.py jobid "$@" # NoColor must be active for ipython because gwt-log cannot interpret ANSI console colors
python run_gms.py jobid "$@" python run_gms.py jobid "$@"
......
...@@ -1136,8 +1136,8 @@ def delete_processing_results(scene_ID, proc_level='all', force=False): ...@@ -1136,8 +1136,8 @@ def delete_processing_results(scene_ID, proc_level='all', force=False):
try: try:
shutil.rmtree(path_procdata) shutil.rmtree(path_procdata)
except OSError: # directory not deletable because it is not empty except OSError: # directory not deletable because it is not empty
if [F for F in glob.glob(path_procdata) if not F.startswith('.fuse_hidden')]: if [F for F in glob.glob(path_procdata) if not os.path.basename(F).startswith('.fuse_hidden')]:
raise # raise OSError if there are other files that .fuse_hidden... remaining raise # raise OSError if there are other files than .fuse_hidden... remaining
else: else:
files2delete = glob.glob(os.path.join(path_procdata, '*%s*' % proc_level)) files2delete = glob.glob(os.path.join(path_procdata, '*%s*' % proc_level))
errors = False # default errors = False # default
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment