bodhi.egg-info/PKG-INFO | 2 +- bodhi.spec | 2 +- bodhi/masher.py | 11 +++++++---- bodhi/release.py | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) New commits: commit 78bbba3d3eddfb409448e412bbe5d32fc1acf56d Author: Luke Macken <lmacken(a)redhat.com&gt; Date: Tue Sep 1 11:20:53 2009 -0400 v0.6.6 diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO index 67c18b1..7ec28de 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.6.5 +Version: 0.6.6 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 f0be526..002bf0d 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.6.5 +Version: 0.6.6 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 53c4265..53acf35 100644 --- a/bodhi/release.py +++ b/bodhi/release.py @@ -1,4 +1,4 @@ -VERSION = '0.6.5' +VERSION = '0.6.6' 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' commit 5999bc1c9a8593b3c291fa6454a4e24a228e454c Author: Luke Macken <lmacken(a)redhat.com&gt; Date: Tue Sep 1 11:20:04 2009 -0400 Fix our masher to work when mashing with *zero* updates diff --git a/bodhi/masher.py b/bodhi/masher.py index bb67e51..c890d92 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -167,10 +167,13 @@ class MashTask(Thread): self.tag = None self.updates = set() map(self.updates.add, updates) - up = self.updates.pop() - self.updates.add(up) - # eg: MASHING-FEDORA, MASHING-FEDORA-EPEL - self.mash_lock_id = up.release.id_prefix + if self.updates: + up = self.updates.pop() + self.updates.add(up) + # eg: MASHING-FEDORA, MASHING-FEDORA-EPEL + self.mash_lock_id = up.release.id_prefix + else: + self.mash_lock_id = 'UNKNOWN' self.koji = buildsys.get_session() # which repos do we want to compose? (updates|updates-testing) self.repos = repos