From b16527306a1ddd0ed5c0a9db78a8ffa64c42ae2e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 12 Jan 2009 00:32:13 +0000
Subject: Only pop the registry stack if we've pushed on to it in makeRegistry.

---
 repoze/bfg/registry.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repoze/bfg/registry.py b/repoze/bfg/registry.py
index 179fbd3dd..8e4c9b5ec 100644
--- a/repoze/bfg/registry.py
+++ b/repoze/bfg/registry.py
@@ -71,9 +71,9 @@ def makeRegistry(filename, package, lock=threading.Lock()):
     registry."""
     
     lock.acquire()
+    registry = Components(package.__name__)
+    registry_manager.push(registry)
     try:
-        registry = Components(package.__name__)
-        registry_manager.push(registry)
         original_getSiteManager.sethook(getSiteManager)
         zope.component.getGlobalSiteManager = registry_manager.get
         zcml_configure(filename, package=package)
-- 
cgit v1.2.3