summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2009-04-12 21:27:33 +0200
committerEdward Hervey <bilboed@bilboed.com>2009-04-12 21:27:33 +0200
commitbbedab4e6521fe7c813f23698fe650203b1d0820 (patch)
tree5026ebf68befc0938cedcd7f3d423a91c969cc2f /gst
parent4d8b4c8dd38f727fb0229fcacc9c883ad6a4f022 (diff)
registry: fix deadlock with recursive registry scanning.
The way to properly fix this issue was in fact to disable the registry scanning when we import gst from the python plugin loader since... we are 100% guaranteed this is being called from a registry scan :)
Diffstat (limited to 'gst')
-rw-r--r--gst/__init__.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/gst/__init__.py b/gst/__init__.py
index d843d43..f29ede2 100644
--- a/gst/__init__.py
+++ b/gst/__init__.py
@@ -190,11 +190,6 @@ try:
except:
pass
-# disable registry update during initialization
-import os
-doupdate = os.getenv("GST_REGISTRY_UPDATE") != "no"
-os.environ["GST_REGISTRY_UPDATE"] = "no"
-
from _gst import *
import interfaces
@@ -232,8 +227,3 @@ if gstlibtoolimporter is not None:
gstlibtoolimporter.uninstall()
import sys
del sys.modules["gstlibtoolimporter"]
-
-if doupdate:
- # update the registry now that we've loaded all symbols
- os.unsetenv("GST_REGISTRY_UPDATE")
- update_registry()