diff options
Diffstat (limited to 'pythia.patch')
| -rw-r--r-- | pythia.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pythia.patch b/pythia.patch index 1701591cdf92..7604319a7ce6 100644 --- a/pythia.patch +++ b/pythia.patch @@ -5,16 +5,16 @@ def get_version_from_xml(): - if not os.path.exists(pjoin(pythia8_path,'share','Pythia8','xmldoc','Version.xml')): -+ if not os.path.exists(pjoin(pythia8_path,'share','pythia','xmldoc','Version.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') -+ pjoin(local_path,'share','pythia','xmldoc','Version.xml') ++ pjoin(local_path,'share','pythia8','xmldoc','Version.xml') 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')): -+ for line in open(pjoin(pythia8_path,'share','pythia','xmldoc','Version.xml')): ++ for line in open(pjoin(pythia8_path,'share','pythia8','xmldoc','Version.xml')): match = versionfinder.match(line) if match: version = match.group('version') @@ -26,22 +26,22 @@ # 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','pythia','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','pythia','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','pythia','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','pythia','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','pythia','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','pythia','examples','Makefile'), ++shutil.copy(pjoin(pythia8_path,'share','pythia8','examples','Makefile'), pjoin(local_path,'Makefile')) if _use_original_PY8_makefile: |