bodhi.cfg | 2 +-
bodhi.spec | 5 ++++-
bodhi/config/app.cfg | 2 +-
bodhi/masher.py | 8 +++++---
4 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 86255381252458fa6e52ac24c9b25e6ac51074db
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Oct 4 03:50:53 2008 -0400
Make our masher extension point less obtrusive
diff --git a/bodhi.cfg b/bodhi.cfg
index c20145d..34cb149 100644
--- a/bodhi.cfg
+++ b/bodhi.cfg
@@ -36,7 +36,7 @@ tg.strict_parameters = True
# MASHER
#masher = None # we are the masher
-masher = 'http://localhost:8085/updates' # point to an external masher
+#masher = 'http://localhost:8085/updates' # point to an external masher
# Buildsystem. 'koji' or 'dev' (default)
# buildsystem = 'koji'
diff --git a/bodhi.spec b/bodhi.spec
index f223a4a..cd42ee0 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -112,6 +112,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Sat Oct 04 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.4-2
+- Make our masher extension point less obtrusive.
+
* Tue Sep 16 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.4-1
- Latest upstream release, containing various bugfixes
- Make our python-fedora requirement explicit (#461518)
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index b108de3..728a150 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -19,7 +19,7 @@
# and other costly operations. To set an external masher, set the masher to
# the baseurl of the bodhi instance. If set to None, this bodhi instance
# will act as a masher as well.
-masher = None
+#masher = None
# Where to initially mash repositories
mashed_dir = '%(top_level_dir)s/../mashed'
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 97eb4c4..7193d75 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -793,8 +793,10 @@ class MashTask(Thread):
def start_extension():
global masher
- log.info("Starting masher extension")
- masher = Masher()
+ if not config.get('masher', True):
+ log.info("Starting masher extension")
+ masher = Masher()
def shutdown_extension():
- log.info("Stopping Masher")
+ if not config.get('masher', True):
+ log.info("Stopping Masher")
Show replies by date