bodhi/mail.py | 5 ++++-
bodhi/model.py | 11 ++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 95d9aaec39afb13ad05d261d4fc24dac7ba0a253
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Nov 21 13:39:11 2008 -0500
Add some more -newkey hacks.
diff --git a/bodhi/mail.py b/bodhi/mail.py
index 8d21f13..ac4561b 100644
--- a/bodhi/mail.py
+++ b/bodhi/mail.py
@@ -286,7 +286,10 @@ 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-newkey'
+ if update.release.name in ('F9', 'F8'):
+ info['yum_repository'] = '
--enablerepo=updates-testing-newkey'
+ else:
+ info['yum_repository'] = ' --enablerepo=updates-testing'
else:
info['testing'] = ''
info['yum_repository'] = ''
diff --git a/bodhi/model.py b/bodhi/model.py
index 61b1c51..2bc7c07 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -833,11 +833,16 @@ class Bugzilla(SQLObject):
message = self.default_msg % (update.get_title(delim=', '), "%s
%s" %
(update.release.long_name, update.status))
if update.status == "testing":
+ if update.release.name in ('F9', 'F8'):
+ repo = 'updates-testing-newkey'
+ else:
+ repo = 'updates-testing'
message += ("\n If you want to test the update, you can install "
+
- "it with \n su -c 'yum
--enablerepo=updates-testing-newkey " +
+ "it with \n su -c 'yum --enablerepo=%s " +
"update %s'. You can provide feedback for this " +
- "update here: %s") % ('
'.join([build.package.name for
- build in update.builds]),
+ "update here: %s") % (repo,
+ ' '.join([build.package.name for build in
+ update.builds]),
config.get('base_address') + url(update.get_url()))
return message
Show replies by date