bodhi.egg-info/PKG-INFO bodhi/release.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 2 +-
bodhi/release.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8a2cfe8d2fdb243a82f408462f44f3579c8b88cd
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Mar 4 16:31:19 2011 -0500
0.7.13
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 5e7cc1b..24302ec 100644
--- a/bodhi.egg-info/PKG-INFO
+++ b/bodhi.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: bodhi
-Version: 0.7.12
+Version: 0.7.13
Summary: Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution
Home-page: https://fedorahosted.org/bodhi
Author: Luke Macken
diff --git a/bodhi.spec b/bodhi.spec
index 94a3d67..b9dfc2c 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.12
+Version: 0.7.13
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
diff --git a/bodhi/release.py b/bodhi/release.py
index 352c19f..8649760 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.12'
+VERSION = '0.7.13'
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'
13 years, 2 months
bodhi/controllers.py bodhi/model.py
by Luke Macken
bodhi/controllers.py | 35 +++++++++--------------------------
bodhi/model.py | 39 ++++++++++++++++++++++++++-------------
2 files changed, 35 insertions(+), 39 deletions(-)
New commits:
commit 59352a416f7553dcb25cca24d859689faf611bac
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Mar 4 16:24:35 2011 -0500
Improve our bugzilla blasts.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 109a30f..94a95ba 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -988,19 +988,11 @@ class Root(controllers.RootController):
repo = 'updates-testing'
try:
Bugzilla.byBz_id(bug).add_comment(update,
- "Package %s:\n"
- "* should fix your issue,\n"
- "* was pushed to the %s updates-testing repository,\n"
- "* should be available at your local mirror within two days.\n"
- "Update it with:\n"
- "# su -c 'yum update --enablerepo=%s %s'\n"
- "as soon as you are able to, then reboot.\n"
- "Please go to the following url:\n"
- "%s\n"
- "then log in and leave karma (feedback)." %
- (update.get_title(delim=', '),
- release.long_name, repo, update.get_title(),
- config.get('base_address') + tg_url(update.get_url())))
+ "%s has been submitted as an update for %s.\n%s"
+ % (update.get_title(delim=', '),
+ release.long_name,
+ config.get('base_address') +
+ tg_url(update.get_url())))
except SQLObjectNotFound:
log.debug('Bug #%d not found in our database' % bug)
@@ -1023,19 +1015,10 @@ class Root(controllers.RootController):
else:
repo = 'updates-testing'
bug.add_comment(update,
- "Package %s:\n"
- "* should fix your issue,\n"
- "* was pushed to the %s updates-testing repository,\n"
- "* should be available at your local mirror within two days.\n"
- "Update it with:\n"
- "# su -c 'yum update --enablerepo=%s %s'\n"
- "as soon as you are able to, then reboot.\n"
- "Please go to the following url:\n"
- "%s\n"
- "then log in and leave karma (feedback)." %
- (update.get_title(delim=', '),
- release.long_name, repo, update.get_title(),
- config.get('base_address') + tg_url(update.get_url())))
+ "%s has been submitted as an update for %s.\n%s" %
+ (update.title, release.long_name,
+ config.get('base_address') +
+ tg_url(update.get_url())))
# If a request is specified, make it. By default we're submitting
# new updates directly into testing
diff --git a/bodhi/model.py b/bodhi/model.py
index 42b1134..52420da 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -1271,9 +1271,19 @@ class Bugzilla(SQLObject):
parent = BoolCol(default=False)
_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."
+ stable_msg = "%s has been pushed to the %s repository. If problems " + \
+ "still persist, please make note of it in this bug report."
+ testing_msg = "Package %s:\n" + \
+ "* should fix your issue,\n" + \
+ "* was pushed to the %s testing repository,\n" + \
+ "* should be available at your local mirror within two days.\n" + \
+ "Update it with:\n" + \
+ "# su -c 'yum update --enablerepo=%s %s'\n" + \
+ "as soon as you are able to%s.\n" + \
+ "Please go to the following url:\n%s\n" + \
+ "then log in and leave karma (feedback)."
def __json__(self):
return dict(bz_id=self.bz_id, title=self.title, security=self.security,
@@ -1314,19 +1324,22 @@ class Bugzilla(SQLObject):
if update.type == 'newpackage':
message = self.newpackage_msg % (update.get_title(delim=', '),
"%s %s" % (update.release.long_name, update.status))
+ elif update.status == 'testing':
+ repo = 'updates-testing'
+ reboot = ''
+ for build in update.builds:
+ if build.package.suggest_reboot:
+ reboot = ', then reboot'
+ break
+ if update.release.name.startswith('EL'):
+ repo = 'epel-testing'
+ message = self.testing_msg % (
+ update.get_title(delim=', '),
+ release.long_name, repo, update.get_title(), reboot,
+ config.get('base_address') + tg_url(update.get_url()))
else:
- message = self.default_msg % (update.get_title(delim=', '),
+ message = self.stable_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 " +
- "it with \n su -c 'yum --enablerepo=%s " +
- "update %s'. You can provide feedback for this " +
- "update here: %s") % (repo,
- ' '.join([build.package.name for build in
- update.builds]),
- config.get('base_address') + url(update.get_url()))
-
return message
def add_comment(self, update, comment=None):
13 years, 2 months
2 commits - bodhi/model.py
by Luke Macken
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)
13 years, 2 months
bodhi/controllers.py bodhi/rss.py
by Luke Macken
bodhi/controllers.py | 6 +++++-
bodhi/rss.py | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit c72d7c55601f36121866ed434278f4576a1a5a83
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 2 16:17:36 2011 -0500
Gracefully handle unknown releases in our critpath api and feed generator
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 6beaa7d..109a30f 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -1435,7 +1435,11 @@ class Root(controllers.RootController):
query = [PackageUpdate.q.status != 'obsolete']
release_name = None
if release and release != u'None':
- release = Release.byName(release)
+ try:
+ release = Release.byName(release)
+ except SQLObjectNotFound:
+ flash('Unknown release: %s' % release)
+ raise redirect('/')
releases = [release]
release_name = release.name
title = title + ' for ' + release.long_name
diff --git a/bodhi/rss.py b/bodhi/rss.py
index a147aae..a0a383b 100644
--- a/bodhi/rss.py
+++ b/bodhi/rss.py
@@ -48,7 +48,6 @@ class Feed(FeedController):
try:
rel = Release.byName(release.upper())
except SQLObjectNotFound:
- log.warning("Cannot find Release '%s' for RSS data" % release)
return dict(title = '%s not found' % release, entries=[])
query.append(PackageUpdate.q.releaseID == rel.id)
title.append(rel.long_name)
@@ -176,7 +175,10 @@ class Feed(FeedController):
title = 'Latest Critical Path Updates'
query = [PackageUpdate.q.status != 'obsolete']
if release:
- release = Release.byName(release)
+ try:
+ release = Release.byName(release)
+ except SQLObjectNotFound:
+ return dict(title = '%s release not found' % release, entries=[])
releases = [release]
title = title + ' for %s' % release.long_name
else:
13 years, 2 months
2 commits - bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
New commits:
commit 840ef3f21f3ac3292e52d587401a2332f6515cb2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 2 16:09:43 2011 -0500
Fix a bug that occurs when you remove a build from an update and add
a new one from a different release.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 91b59e6..6beaa7d 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -692,19 +692,12 @@ class Root(controllers.RootController):
# Make sure the tag has not been moved, which indicates that we
# are in the middle of pushing this update
if edited.get_implied_build_tag() not in buildinfo[builds[0]]['tags']:
- if edited.request:
- flash_log("Unable to edit update. %s is currently tagged with %s "
- "where bodhi expects it to be %s. This most likely means "
- "that this update is currently being pushed." % (
- builds[0], buildinfo[builds[0]]['tags'],
- edited.get_implied_build_tag()))
- raise InvalidUpdateException(params)
- else:
- log.warn('Mismatched tags for an update without a request!?')
- log.debug(edited)
- log.debug('Implied tag: %s\nActual tags: %s' % (
- edited.get_implied_build_tag(),
- buildinfo[builds[0]]['tags']))
+ flash_log("Unable to edit update. %s is currently tagged with %s "
+ "where bodhi expects it to be %s. This could mean "
+ "that this update is currently being pushed." % (
+ builds[0], buildinfo[builds[0]]['tags'],
+ edited.get_implied_build_tag()))
+ raise InvalidUpdateException(params)
# Determine which builds have been added or removed
edited_builds = [build.nvr for build in edited.builds]
commit f7d2a83d4248def052017024d3a1c756ac736c59
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 2 15:10:09 2011 -0500
Readability tweak
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index b18fe17..91b59e6 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -716,8 +716,9 @@ class Root(controllers.RootController):
for build in edited_builds:
if build not in builds:
removed_builds.append(build)
+
+ # Comment on the update with details of added/removed builds
if new_builds or removed_builds:
- # Comment on the update with details of added/removed builds
comment = '%s has edited this update. ' % identity.current.user_name
if new_builds:
comment += 'New build(s): %s. ' % ', '.join(new_builds)
13 years, 2 months