diff options
Diffstat (limited to 'pythia.patch')
| -rw-r--r-- | pythia.patch | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/pythia.patch b/pythia.patch index 7604319a7ce6..b5fbe8de8e50 100644 --- a/pythia.patch +++ b/pythia.patch @@ -1,47 +1,34 @@ --- a/get_pythia8_version.py +++ b/get_pythia8_version.py -@@ -29,14 +29,14 @@ +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2 ++#!/usr/bin/env python + + import sys + import os +@@ -29,17 +29,17 @@ version = None def get_version_from_xml(): - if not os.path.exists(pjoin(pythia8_path,'share','Pythia8','xmldoc','Version.xml')): +- print( "Error in 'get_pythia8_version.py': could not get Pyhtia8 file \n '%s'\n storing the version number"% \ +- pjoin(local_path,'share','Pythia8','xmldoc','Version.xml')) +- return None + if not os.path.exists(pjoin(pythia8_path,'share','pythia8','xmldoc','Version.xml')): - print "Error in 'get_pythia8_version.py': could not get Pyhtia8 file \n '%s'\n storing the version number"% \ -- pjoin(local_path,'share','Pythia8','xmldoc','Version.xml') ++ print "Error in 'get_pythia8_version.py': could not get Pyhtia8 file \n '%s'\n storing the version number"% \ + pjoin(local_path,'share','pythia8','xmldoc','Version.xml') - return None ++ return None versionfinder = re.compile('^\s*\<parmfix\s*name\=\"Pythia:versionNumber\"\s*default=\"(?P<version>[\d\.]+)\"\>') - for line in open(pjoin(pythia8_path,'share','Pythia8','xmldoc','Version.xml')): +- match = versionfinder.match(line) +- if match: +- version = match.group('version') + for line in open(pjoin(pythia8_path,'share','pythia8','xmldoc','Version.xml')): - match = versionfinder.match(line) - if match: - version = match.group('version') - ---- a/compile.py -+++ b/compile.py -@@ -103,17 +103,17 @@ - - # Now proceed with the installation - --if not os.path.exists(pjoin(pythia8_path,'share','Pythia8','examples','Makefile.inc')): -+if not os.path.exists(pjoin(pythia8_path,'share','pythia8','examples','Makefile.inc')): - print "Error in MG5aMC_PY8_interface installer. Could not find file:\n %s"%\ -- pjoin(pythia8_path,'share','Pythia8','examples','Makefile.inc') -+ pjoin(pythia8_path,'share','pythia8','examples','Makefile.inc') - sys.exit(error_exit_code) --shutil.copy(pjoin(pythia8_path,'share','Pythia8','examples','Makefile.inc'), -+shutil.copy(pjoin(pythia8_path,'share','pythia8','examples','Makefile.inc'), - pjoin(local_path,'Makefile.inc')) --if not os.path.exists(pjoin(pythia8_path,'share','Pythia8','examples','Makefile')): -+if not os.path.exists(pjoin(pythia8_path,'share','pythia8','examples','Makefile')): - print "Error in MG5aMC_PY8_interface installer. Could not find file:\n %s"%\ -- pjoin(pythia8_path,'share','Pythia8','examples','Makefile') -+ pjoin(pythia8_path,'share','pythia8','examples','Makefile') - sys.exit(error_exit_code) --shutil.copy(pjoin(pythia8_path,'share','Pythia8','examples','Makefile'), -+shutil.copy(pjoin(pythia8_path,'share','pythia8','examples','Makefile'), - pjoin(local_path,'Makefile')) - - if _use_original_PY8_makefile: ++ match = versionfinder.match(line) ++ if match: ++ version = match.group('version') + return version + return None + |