Merge pull request #80 from webmaster128/processDirect

Pull out processDirect()
frerich · May 16, 2016 · dc63c22 · dc63c22
2 parents a34dc99 + fa8f3ac
commit dc63c22
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/clcache.py b/clcache.py
@@ -1156,8 +1156,14 @@ def processCompileRequest(cache, compiler, args):
                 stats.registerCallForExternalDebugInfo()
             stats.save()
         return invokeRealCompiler(compiler, args[1:])
+
     if 'CLCACHE_NODIRECT' in os.environ:
         return processNoDirect(cache, outputFile, compiler, cmdLine)
+    else:
+        return processDirect(cache, outputFile, compiler, cmdLine, sourceFile)
+
+
+def processDirect(cache, outputFile, compiler, cmdLine, sourceFile):
     manifestHash = ObjectCache.getManifestHash(compiler, cmdLine, sourceFile)
     with cache.lock:
         manifest = cache.getManifest(manifestHash)
@@ -1195,6 +1201,7 @@ def processCompileRequest(cache, compiler, args):
     printTraceStatement("Finished. Exit code %d" % compilerResult[0])
     return compilerResult
 
+
 def processNoDirect(cache, outputFile, compiler, cmdLine):
     cachekey = ObjectCache.computeKey(compiler, cmdLine)
     with cache.lock: