bodhi/masher.py | 11 +----------
setup.py | 3 ---
2 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 19360034e663b778b58c68af0358eae9c84553a1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Oct 6 19:55:06 2008 -0400
Convert the Masher into a plain global object instead of a turbogears extension.
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 7193d75..ff4b4e8 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -36,7 +36,6 @@ from bodhi.metadata import ExtendedMetadata
from bodhi.exceptions import MashTaskException
log = logging.getLogger(__name__)
-masher = None
lock = Lock()
def get_masher():
@@ -791,12 +790,4 @@ class MashTask(Thread):
log.info(val)
return val
-def start_extension():
- global masher
- if not config.get('masher', True):
- log.info("Starting masher extension")
- masher = Masher()
-
-def shutdown_extension():
- if not config.get('masher', True):
- log.info("Stopping Masher")
+masher = Masher()
diff --git a/setup.py b/setup.py
index f9f40a5..03cb807 100644
--- a/setup.py
+++ b/setup.py
@@ -174,8 +174,5 @@ setup(
'bodhi-devinit = bodhi.tools.dev_init:main',
'bodhi-rmrelease = bodhi.tools.rmrelease:main',
),
- 'turbogears.extensions': (
- 'masher = bodhi.masher'
- ),
}
)
Show replies by date