bodhi.spec | 5 ++++-
bodhi/model.py | 7 +++++--
bodhi/release.py | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 3bed185b9ac5e63792175687e5683cee7776637f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Mar 8 15:45:39 2010 -0500
Make our unstable karma obsoletion message configurable, and slightly more useful
diff --git a/bodhi/model.py b/bodhi/model.py
index 34d2220..b002b6a 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -749,7 +749,8 @@ class PackageUpdate(SQLObject):
if self.status == 'testing' and self.unstable_karma != 0 and \
self.karma == self.unstable_karma:
log.info("Automatically unpushing %s" % self.title)
- self.obsolete()
+ self.obsolete(msg='This update has reached a karma of %s and is '
+ 'being unpushed and marked as unstable' %
self.karma)
mail.send(self.submitter, 'unstable', self)
# If we're a Critical Path update for a pending release
@@ -814,7 +815,7 @@ class PackageUpdate(SQLObject):
log.exception(e)
self.pushed = False
- def obsolete(self, newer=None):
+ def obsolete(self, newer=None, msg=None):
"""
Obsolete this update. Even though unpushing/obsoletion is an "instant"
action, changes in the repository will not propagate until the next
@@ -828,6 +829,8 @@ class PackageUpdate(SQLObject):
if newer:
self.comment("This update has been obsoleted by %s" % newer,
author='bodhi')
+ elif msg:
+ self.comment(msg, author='bodhi')
else:
self.comment("This update has been obsoleted",
author='bodhi')
commit 96f35eab0d3e4a841b9a951982444a8ee03e029c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 4 16:12:45 2010 -0500
0.7.4
diff --git a/bodhi.spec b/bodhi.spec
index 2c54959..52ab6a6 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,7 +2,7 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print
sys.version[:3]")}
Name: bodhi
-Version: 0.7.3
+Version: 0.7.4
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -116,6 +116,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Thu Mar 04 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.4-1
+- 0.7.4
+
* Thu Mar 04 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.3-1
- 0.7.3
diff --git a/bodhi/release.py b/bodhi/release.py
index 3f72f5e..ff270ef 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.3'
+VERSION = '0.7.4'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of
publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
Show replies by date