From bbbe1e1e7fd5d92f8cbb0005f1fc0255c6cc75a1 Mon Sep 17 00:00:00 2001
From: anphi <anne.philipp@univie.ac.at>
Date: Thu, 9 Jul 2020 10:49:47 +0200
Subject: [PATCH] solved a failed merge
---
Source/Python/install.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/Source/Python/install.py b/Source/Python/install.py
index b5c3d5a..701e821 100755
--- a/Source/Python/install.py
+++ b/Source/Python/install.py
@@ -514,11 +514,7 @@ def mk_compilejob(makefile, ecuid, ecgid, fp_root):
Parameters
----------
makefile : str
-<<<<<<< HEAD
- Name of the makefile which should be used to compile FORTRAN
-=======
Name of the makefile which should be used to compile the Fortran
->>>>>>> origin/task/language-editing
program.
ecuid : str
@@ -708,21 +704,13 @@ def mk_fortran_build(src_path, makefile):
print(perr.decode())
print('Please edit ' + makefile +
' or try another makefile in the src directory.')
-<<<<<<< HEAD
print('Most likely ECCODES_INCLUDE_DIR, ECCODES_LIB '
-=======
- print('Most likely GRIB_API_INCLUDE_DIR, GRIB_API_LIB '
->>>>>>> origin/task/language-editing
'and EMOSLIB must be adapted.')
print('Available makefiles:')
print(UioFiles(src_path, 'makefile*'))
sys.exit('Compilation failed!')
except ValueError as e:
-<<<<<<< HEAD
print('ERROR: makefile call failed:')
-=======
- print('ERROR: make of Fortran code failed:')
->>>>>>> origin/task/language-editing
print(e)
else:
execute_subprocess(['ls', '-l',
--
GitLab