mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Remove another incorrect lock statement.
This commit is contained in:
@@ -184,9 +184,8 @@ class Registry( object ):
|
||||
if ok:
|
||||
datatype_class = None
|
||||
if proprietary_path and proprietary_datatype_module and datatype_class_name:
|
||||
# We need to change the value of sys.path, so do it in a way that is thread-safe.
|
||||
lock = threading.Lock()
|
||||
lock.acquire( True )
|
||||
# TODO: previously comments suggested this needs to be locked because it modifys
|
||||
# the sys.path, probably true but the previous lock wasn't doing that.
|
||||
try:
|
||||
imported_module = __import_module( proprietary_path,
|
||||
proprietary_datatype_module,
|
||||
@@ -198,8 +197,6 @@ class Registry( object ):
|
||||
except Exception, e:
|
||||
full_path = os.path.join( proprietary_path, proprietary_datatype_module )
|
||||
self.log.debug( "Exception importing proprietary code file %s: %s" % ( str( full_path ), str( e ) ) )
|
||||
finally:
|
||||
lock.release()
|
||||
# Either the above exception was thrown because the proprietary_datatype_module is not derived from a class
|
||||
# in the repository, or we are loading Galaxy's datatypes. In either case we'll look in the registry.
|
||||
if datatype_class is None:
|
||||
|
||||
Reference in New Issue
Block a user