Merge pull request #831 from ganga-devs/GaudiExecFix

A fix for the thread lock in the GaudiExec prepare

Author: mesmith75

python/Ganga/__init__.py

@@ -25,7 +25,7 @@ def getLCGRootPath():
 
 # ------------------------------------------------
 # store Ganga version based on new git tag for this file
-_gangaVersion = '$Name: 6.2.1 $'
+_gangaVersion = '$Name: 6.2.0 $'
 
 # [N] in the pattern is important because it prevents CVS from expanding the pattern itself!
 r = re.compile(r'\$[N]ame: (?P<version>\S+) \$').match(_gangaVersion)

python/GangaDirac/Lib/RTHandlers/DiracRTHUtils.py

@@ -87,7 +87,6 @@ def dirac_outputfile_jdl(output_files, empty_SE_check):
             if empty_SE_check:
                 ## If true check, if not false check
                 raise BackendError("Dirac", "Can't submit a DIRAC job with DiracFile outputfile without setting a defaultSE.")
-            config = getConfig('Dirac')
             myLine = myLine.replace('###OUTPUT_SE###', str([]))
 
         total_JDL += myLine + "\n"

python/GangaLHCb/Lib/Applications/GaudiExec.py

@@ -42,7 +42,7 @@ def masterPrepLock(self, *args, **kwds):
 
         # Get the global lock and prepare
         with gaudiExecBuildLock.globalBuildLock:
-            return f(*args, **kwds)
+            return f(self,*args, **kwds)
 
     return masterPrepLock