2 commits - bodhi.egg-info/PKG-INFO bodhi/release.py bodhi.spec bodhi/tools

bodhi.egg-info/PKG-INFO | 2 +- bodhi.spec | 7 +++++-- bodhi/release.py | 2 +- bodhi/tools/clean-testing.py | 18 ++++++++++-------- bodhi/tools/client.py | 2 ++ bodhi/tools/tagcheck.py | 11 +++++++---- 6 files changed, 26 insertions(+), 16 deletions(-) New commits: commit c01cc71b40b8f847f17ea2e647a6c0e6c520e4fb Author: Luke Macken <lmacken(a)redhat.com&gt; Date: Thu Sep 11 14:55:23 2008 -0400 Fix some various issues with some of our tools diff --git a/bodhi/tools/clean-testing.py b/bodhi/tools/clean-testing.py index 29d2343..316df82 100755 --- a/bodhi/tools/clean-testing.py +++ b/bodhi/tools/clean-testing.py @@ -13,6 +13,7 @@ import turbogears from sqlobject import SQLObjectNotFound from turbogears.database import PackageHub +from bodhi.util import load_config from bodhi.model import Release, PackageBuild from bodhi.buildsys import get_session @@ -40,15 +41,16 @@ def clean_testing_builds(untag=False): stable_build['nvr']) try: build = PackageBuild.byNvr(testing_build['nvr']) - if build.update.status != 'testing': - print "%s not testing in bodhi!" % build.update - raise SQLObjectNotFound - else: - if untag: - print "Obsoleting via bodhi" - build.update.obsolete(newer=stable_build['nvr']) + for update in build.updates: + if update.status != 'testing': + print "%s not testing in bodhi!" % update.title + raise SQLObjectNotFound else: - print "Need to obsolete via bodhi" + if untag: + print "Obsoleting via bodhi" + update.obsolete(newer=stable_build['nvr']) + else: + print "Need to obsolete via bodhi" except SQLObjectNotFound: if untag: print "Untagging via koji" diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py index b8ef32e..56c6b1d 100755 --- a/bodhi/tools/client.py +++ b/bodhi/tools/client.py @@ -193,6 +193,8 @@ def main(): log.info(data['tg_flash']) elif opts.push: data = bodhi.push() + if not data: + log.error("The masher did not return anything :(") log.info("[ %d Pending Requests ]" % len(data['updates'])) for status in ('testing', 'stable', 'obsolete'): updates = filter(lambda x: x['request'] == status, diff --git a/bodhi/tools/tagcheck.py b/bodhi/tools/tagcheck.py index 24d2bf6..2fb14a8 100755 --- a/bodhi/tools/tagcheck.py +++ b/bodhi/tools/tagcheck.py @@ -25,11 +25,14 @@ def main(): except SQLObjectNotFound: print "PackageUpdate(%s) not found!" % nvr continue - if not build.update: - print "PackageBuild(%s) has no update" % (build.nvr) + if not len(build.updates): + print "PackageBuild(%s) has no updates" % (build.nvr) status = 'testing' in tag and 'testing' or 'stable' - if build.update.status != status: - print "%s is not tagged as %s in koji" % (build.nvr, status) + for update in build.updates: + if update.status != status: + print "%s is %s in bodhi but tagged as %s in koji" % (update.title, + update.status, + tag) if __name__ == '__main__': main() commit 41c466f7a737856a9ce139f6b7df23fae109641f Author: Luke Macken <lmacken(a)redhat.com&gt; Date: Thu Sep 11 14:55:03 2008 -0400 0.5.3 release diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO index b6fb5e0..042be39 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.5.2 +Version: 0.5.3 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 995962a..20de2b6 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -2,8 +2,8 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: bodhi -Version: 0.5.2 -Release: 27%{?dist} +Version: 0.5.3 +Release: 3%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet License: GPLv2+ @@ -111,6 +111,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py %changelog +* Wed Sep 10 2008 Luke Macken <lmacken(a)redhat.com&gt; - 0.5.3-1 +- Latest upstream release + * Wed Sep 03 2008 Luke Macken <lmacken(a)redhat.com&gt; - 0.5.2-2 - Add the masher deps to BuildRequires, since it now resides on the turbogears.extensions entry point and will be diff --git a/bodhi/release.py b/bodhi/release.py index 5d5b45d..00edd50 100644 --- a/bodhi/release.py +++ b/bodhi/release.py @@ -1,4 +1,4 @@ -VERSION = '0.5.2' +VERSION = '0.5.3' 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'