bodhi/admin.py | 4 ++-- bodhi/masher.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 7408fd504ddbe5eadaf10d0b6fc23a7b26d9accd Author: Luke Macken lmacken@redhat.com Date: Mon Aug 22 10:13:47 2011 -0400
Make our buildroot override expiration more robust
diff --git a/bodhi/masher.py b/bodhi/masher.py index e6e66a4..fe1b26f 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -477,7 +477,10 @@ class MashTask(Thread): """ Obsolete any buildroot overrides that are in this push """ for update in self.updates: if update.request == 'stable': - update.expire_buildroot_overrides() + try: + update.expire_buildroot_overrides() + except Exception, e: + log.exception(e)
# With a large pushes, this tends to cause much buildsystem churn, as well # as polluting the tag history.
commit f8ab54f667b7c2479a05652784e6d33f18390ea8 Author: Luke Macken lmacken@redhat.com Date: Mon Aug 22 10:13:35 2011 -0400
Update our tag usage in our admin.py to work with the new koji tag schema
diff --git a/bodhi/admin.py b/bodhi/admin.py index e820ece..c1a36c9 100644 --- a/bodhi/admin.py +++ b/bodhi/admin.py @@ -62,8 +62,8 @@ class AdminController(Controller, SecureResource): from bodhi.masher import masher tags = [] for release in Release.select(): - tags.append('%s-updates' % release.dist_tag.split('-')[1]) - tags.append('%s-updates-testing' % release.dist_tag.split('-')[1]) + tags.append(release.stable_tag) + tags.append(release.testing_tag) return dict(masher_str=str(masher), tags=tags)
@expose(template='bodhi.templates.text')