Commit bddb7417 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

GAUDI-1113: readded 'import locker' (where needed) to merge_files.py

parent bf01805b
......@@ -183,6 +183,7 @@ if __name__ == "__main__":
logging.basicConfig(level = logging.INFO)
if "GAUDI_BUILD_LOCK" in os.environ:
import locker
globalLock = locker.LockFile(os.environ["GAUDI_BUILD_LOCK"], temporary = True)
else:
globalLock = None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment