bodhi/masher.py
by Luke Macken
bodhi/masher.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 972bc42b2db5895908ab9caf87b3cb964e9302d3
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Nov 11 10:07:32 2008 -0500
Fix the updates-testing digest notifications (Ticket #243)
diff --git a/bodhi/masher.py b/bodhi/masher.py
index ff4b4e8..f98074c 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -31,7 +31,7 @@ from time import sleep
from bodhi import buildsys, mail
from bodhi.util import synchronized, sanity_check_repodata
-from bodhi.model import PackageUpdate
+from bodhi.model import PackageUpdate, Release
from bodhi.metadata import ExtendedMetadata
from bodhi.exceptions import MashTaskException
@@ -673,11 +673,10 @@ class MashTask(Thread):
# Add the detail of each build
for nvr in updlist:
maildata += u"\n" + self.testing_digest[prefix][nvr]
- log.debug("mail.send_mail(%r, %r, %r, %r)" % (config.get('bodhi_email'),
- config.get('test_announce_list'), '%s updates-testing report' % prefix.title(),
- maildata))
+ release = Release.select(Release.q.long_name==prefix)[0]
mail.send_mail(config.get('bodhi_email'),
- config.get('test_announce_list'),
+ config.get('%s_test_announce_list' %
+ release.id_prefix.lower()),
'%s updates-testing report' % prefix.title(),
maildata)
15 years, 6 months
bodhi/tools
by Luke Macken
bodhi/tools/client.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ea3ca70f5b8d5ad795b89baf61be48cb1039ff63
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Nov 6 18:51:58 2008 -0500
Make the --release optional in our client
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index 986b910..61f5df5 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -78,7 +78,7 @@ def get_parser():
dest="bugs", help="Specify any number of Bugzilla IDs "
"(--bugs=1234,5678)", default="")
parser.add_option("-r", "--release", action="store", type="string",
- dest="release", help="Specify a release [F7|F8]")
+ dest="release", help="Specify a release [F8|F9|F10] (optional)")
parser.add_option("-N", "--notes", action="store", type="string",
dest="notes", help="Update notes", default="")
parser.add_option("-t", "--type", action="store", type="string",
15 years, 6 months
3 commits - bodhi.cfg bodhi/mail.py bodhi/model.py
by Luke Macken
bodhi.cfg | 2 +-
bodhi/mail.py | 2 +-
bodhi/model.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f5bbaaa593d6505cdd71765b63c364574bc5e43c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Nov 6 18:02:53 2008 -0500
Make note of the updates-testing-newkey repo on bug comments
diff --git a/bodhi/model.py b/bodhi/model.py
index 293d097..61b1c51 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -834,7 +834,7 @@ class Bugzilla(SQLObject):
(update.release.long_name, update.status))
if update.status == "testing":
message += ("\n If you want to test the update, you can install " +
- "it with \n su -c 'yum --enablerepo=updates-testing " +
+ "it with \n su -c 'yum --enablerepo=updates-testing-newkey " +
"update %s'. You can provide feedback for this " +
"update here: %s") % (' '.join([build.package.name for
build in update.builds]),
commit 9b0acba5fca52eb5a357fb2381a50b7522b545aa
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Nov 6 18:02:32 2008 -0500
Enable the masher by default
diff --git a/bodhi.cfg b/bodhi.cfg
index e00b013..a9ef734 100644
--- a/bodhi.cfg
+++ b/bodhi.cfg
@@ -35,7 +35,7 @@ tg.strict_parameters = True
#base_url_filter.use_x_forwarded_host = True
# MASHER
-#masher = None # we are the masher
+masher = None # we are the masher
#masher = 'http://localhost:8085/updates' # point to an external masher
# Buildsystem. 'koji' or 'dev' (default)
commit 8e2035b15fc7e2069bed22646ef5136f67c08885
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Nov 6 18:01:18 2008 -0500
Update our mail template to reflect the updates-testing-newkey repo
diff --git a/bodhi/mail.py b/bodhi/mail.py
index 3c19ad1..8d21f13 100644
--- a/bodhi/mail.py
+++ b/bodhi/mail.py
@@ -286,7 +286,7 @@ def get_template(update, use_template=errata_template):
info['url'] = h[rpm.RPMTAG_URL]
if update.status == 'testing':
info['testing'] = ' Test'
- info['yum_repository'] = ' --enablerepo=updates-testing'
+ info['yum_repository'] = ' --enablerepo=updates-testing-newkey'
else:
info['testing'] = ''
info['yum_repository'] = ''
15 years, 6 months