bodhi/model.py | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 530c321e2fcab58709e4c7225f25147dbba893b0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 3 00:20:59 2011 -0500
When a newpackage hits stable, don't say "if problems still persist..."
in the bug.
diff --git a/bodhi/model.py b/bodhi/model.py
index 09ce350..42b1134 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -1273,6 +1273,7 @@ class Bugzilla(SQLObject):
_bz_server = config.get("bz_server")
default_msg = "%s has been pushed to the %s repository. If problems " + \
"still persist, please make note of it in this bug report."
+ newpackage_msg = "%s has been pushed to the %s repository."
def __json__(self):
return dict(bz_id=self.bz_id, title=self.title, security=self.security,
@@ -1310,8 +1311,12 @@ class Bugzilla(SQLObject):
self.security = True
def _default_message(self, update):
- message = self.default_msg % (update.get_title(delim=', '), "%s
%s" %
- (update.release.long_name, update.status))
+ if update.type == 'newpackage':
+ message = self.newpackage_msg % (update.get_title(delim=', '),
+ "%s %s" % (update.release.long_name, update.status))
+ else:
+ message = self.default_msg % (update.get_title(delim=', '),
+ "%s %s" % (update.release.long_name, update.status))
if update.status == "testing":
repo = 'updates-testing'
message += ("\n If you want to test the update, you can install "
+
commit 0324a811d5d8c4162fcbfd1725d8e68d4af7b7b7
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 2 18:17:27 2011 -0500
Fix a bug that could cause unapproved critpath updates to go to stable
diff --git a/bodhi/model.py b/bodhi/model.py
index 5f953e2..09ce350 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -870,17 +870,20 @@ class PackageUpdate(SQLObject):
if self.stable_karma != 0 and self.stable_karma == self.karma:
if self.pushable:
- log.info("Automatically marking %s as stable" % self.title)
- if self.request == 'testing':
- self.remove_tag(self.release.pending_testing_tag)
- if self.request != 'stable':
- self.add_tag(self.release.pending_stable_tag)
- self.request = 'stable'
- self.pushed = False
- #self.date_pushed = None
- self.comment(config.get('stablekarma_comment'),
author='bodhi')
- mail.send(self.submitter, 'stablekarma', self)
- mail.send_admin('stablekarma', self)
+ if self.critpath and not self.critpath_approved:
+ pass
+ else:
+ log.info("Automatically marking %s as stable" %
self.title)
+ if self.request == 'testing':
+ self.remove_tag(self.release.pending_testing_tag)
+ if self.request != 'stable':
+ self.add_tag(self.release.pending_stable_tag)
+ self.request = 'stable'
+ self.pushed = False
+ #self.date_pushed = None
+ self.comment(config.get('stablekarma_comment'),
author='bodhi')
+ mail.send(self.submitter, 'stablekarma', self)
+ mail.send_admin('stablekarma', self)
if self.status == 'testing' and self.unstable_karma != 0 and \
self.karma == self.unstable_karma:
@@ -1177,7 +1180,6 @@ class PackageUpdate(SQLObject):
return False
-
class Comment(SQLObject):
timestamp = DateTimeCol(default=datetime.utcnow)
update = ForeignKey("PackageUpdate", notNone=True)
Show replies by date