January 2010 - bodhi - Fedora mailing-lists

bodhi/controllers.py bodhi/tests
by Luke Macken 28 Jan '10

28 Jan '10

bodhi/controllers.py | 13 ++++++++++++- bodhi/tests/test_controllers.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) New commits: commit 2f21b5bf5cd74d050c38f7fccedf2d4df3c9e305 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 28 06:31:28 2010 -0500 Update newly added bugs when editing an update (#386) diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 33c7734..ae224cb 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -29,9 +29,10 @@ from sqlobject.sqlbuilder import AND, OR from turbogears import (controllers, expose, validate, redirect, identity, paginate, flash, error_handler, validators, config) +from turbogears import url as tg_url from turbogears.widgets import DataGrid -from fedora.tg.util import request_format, tg_url +from fedora.tg.util import request_format from fedora.tg.controllers import login as fc_login from fedora.tg.controllers import logout as fc_logout @@ -826,6 +827,7 @@ class Root(controllers.RootController): # Add/remove the necessary Bugzillas try: + original_bugs = [bug.bz_id for bug in update.bugs] update.update_bugs(bugs) except xmlrpclib.Fault, f: log.exception(f) @@ -848,6 +850,15 @@ class Root(controllers.RootController): #mail.send(update.get_maintainers(), 'edited', update) mail.send(update.submitter, 'edited', update) note.insert(0, "Update successfully edited") + + # Update any newly added bugs + for bug in bugs: + if bug not in original_bugs: + log.debug("Updating newly added bug: %s" % bug) + Bugzilla.byBz_id(bug).add_comment(update, + "%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()))) else: # Notify security team of newly submitted security updates if update.type == 'security': diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 75c82a1..6f6e9c0 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1822,3 +1822,32 @@ class TestControllers(testutil.DBTest): json = simplejson.loads(cherrypy.response.body[0]) assert json['num_items'] == 100, json['num_items'] assert len(json['updates']) == 100, len(json['updates']) + + def test_add_bugs_to_update(self): + session = login() + f7 = create_release() + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7', + 'type_' : 'bugfix', + 'bugs' : '1', + 'cves' : '', + 'notes' : '' + } + self.save_update(params, session) + + # Add another build, for a different release + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '1 2', + 'cves' : '', + 'notes' : '', + 'edited' : 'TurboGears-1.0.2.2-2.fc7,python-sqlobject-0.8.2-1.fc7', + } + + testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) + self.save_update(params, session) + logs = testutil.get_log() + assert 'Updating newly added bug: 2' in logs + assert len(PackageUpdate.byTitle(params['edited']).bugs) == 2

1 0

bodhi/controllers.py bodhi/tests
by Luke Macken 28 Jan '10

28 Jan '10

bodhi/controllers.py | 13 +++++++- bodhi/tests/test_controllers.py | 64 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) New commits: commit 261aa87a8c090afd8a4543c46d173371f0dc439e Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 28 05:58:16 2010 -0500 Detect conflicting builds when editing updates (#385) diff --git a/bodhi/controllers.py b/bodhi/controllers.py index af7c1de..33c7734 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -40,7 +40,7 @@ from bodhi.rss import Feed from bodhi.new import NewUpdateController, update_form from bodhi.util import make_update_link, make_type_icon, make_karma_icon, link from bodhi.util import flash_log, get_pkg_pushers, make_request_icon -from bodhi.util import json_redirect, url +from bodhi.util import json_redirect, url, get_nvr from bodhi.admin import AdminController from bodhi.metrics import MetricsController from bodhi.model import (Package, PackageBuild, PackageUpdate, Release, @@ -637,6 +637,17 @@ class Root(controllers.RootController): "engineering at %s about unpushing this update." % config.get('release_team_address')) raise InvalidUpdateException(params) + + # Check for conflicting builds when editing + for build in builds: + for other_build in builds: + if get_nvr(build)[0] == get_nvr(other_build)[0]: + if build != other_build: + flash_log("Unable to save update with conflicting builds of " + "the same package: %s and %s. Please remove one " + "and try again." % (build, other_build)) + raise InvalidUpdateException(params) + edited.unpush() # Refresh the tags for these builds diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index fbee31f..75c82a1 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -359,6 +359,70 @@ class TestControllers(testutil.DBTest): assert f7up.builds[0].nvr == f7build assert f7up.builds[0].package.name == 'TurboGears' + def test_add_older_build_to_update(self): + """ Try adding a newer build an update (#385) """ + session = login() + f7 = create_release() + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7', + 'type_' : 'bugfix', + 'bugs' : '', + 'cves' : '', + 'notes' : '' + } + self.save_update(params, session) + + # Add another build, for a different release + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7 TurboGears-1.0.2.2-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '1', + 'cves' : '', + 'notes' : '', + 'edited' : 'TurboGears-1.0.2.2-2.fc7,python-sqlobject-0.8.2-1.fc7', + } + + testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) + self.save_update(params, session) + logs = testutil.get_log() + up = PackageUpdate.select()[0] + assert len(up.builds) == 2, up.builds + assert up.title == params['edited'] + assert u'Unable to save update with conflicting builds of the same package: TurboGears-1.0.2.2-2.fc7 and TurboGears-1.0.2.2-1.fc7. Please remove one and try again.' in logs + + def test_add_newer_build_to_update(self): + """ Try adding a newer build an update (#385) """ + session = login() + f7 = create_release() + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7', + 'type_' : 'bugfix', + 'bugs' : '', + 'cves' : '', + 'notes' : '' + } + self.save_update(params, session) + + # Add another build, for a different release + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc7 TurboGears-1.0.2.2-3.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '1', + 'cves' : '', + 'notes' : '', + 'edited' : 'TurboGears-1.0.2.2-2.fc7,python-sqlobject-0.8.2-1.fc7', + } + + testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) + self.save_update(params, session) + logs = testutil.get_log() + up = PackageUpdate.select()[0] + assert len(up.builds) == 2, up.builds + assert up.title == params['edited'] + assert u'Unable to save update with conflicting builds of the same package: TurboGears-1.0.2.2-2.fc7 and TurboGears-1.0.2.2-3.fc7. Please remove one and try again.' in logs + def test_add_different_release_to_update(self): """ Try adding a build for a different release to an update (#251)

1 0

bodhi/controllers.py bodhi/util.py
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/controllers.py | 3 +-- bodhi/util.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 28bc5e48eb9b82cb8ff9dc0d9ec1a8b956816ed9 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 23:39:57 2010 -0500 Apply a patch from Toshio to use fedora.tg.util.tg_url diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 5daf4c5..af7c1de 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -29,10 +29,9 @@ from sqlobject.sqlbuilder import AND, OR from turbogears import (controllers, expose, validate, redirect, identity, paginate, flash, error_handler, validators, config) -from turbogears import url as tg_url from turbogears.widgets import DataGrid -from fedora.tg.util import request_format +from fedora.tg.util import request_format, tg_url from fedora.tg.controllers import login as fc_login from fedora.tg.controllers import logout as fc_logout diff --git a/bodhi/util.py b/bodhi/util.py index cc48eb7..0fc4909 100644 --- a/bodhi/util.py +++ b/bodhi/util.py @@ -33,10 +33,11 @@ from yum.misc import checksum from os.path import isdir, join, dirname, basename, isfile from datetime import datetime from decorator import decorator -from turbogears import config, flash, redirect, url as tg_url +from turbogears import config, flash, redirect from fedora.tg.util import request_format from fedora.client import PackageDB from fedora.tg.util import url as csrf_url +from fedora.tg.util import tg_url from bodhi.exceptions import (RPMNotFound, RepodataException, InvalidUpdateException)

1 0

bodhi/controllers.py bodhi/tests
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/controllers.py | 8 ++++++++ bodhi/tests/test_controllers.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) New commits: commit ed526428192fe6af23352bd809dffc0d6e2349d8 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 10:56:47 2010 -0500 Disallow the ability to edit an update, and add a build from a different release (#251) diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 9f1915d..5daf4c5 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -661,6 +661,14 @@ class Root(controllers.RootController): break if rel: log.debug("Adding %s for %s" % (rel.name, build)) + if edited: + if edited.release != rel: + valid = False + flash_log("Cannot add a %s build to a %s update. " + "Please create a new update for %s" % ( + rel.name, edited.release.name, build)) + raise InvalidUpdateException(params) + if not releases.has_key(rel): releases[rel] = [] if build not in releases[rel]: diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index b998952..fbee31f 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -359,6 +359,38 @@ class TestControllers(testutil.DBTest): assert f7up.builds[0].nvr == f7build assert f7up.builds[0].package.name == 'TurboGears' + def test_add_different_release_to_update(self): + """ + Try adding a build for a different release to an update (#251) + """ + session = login() + f7 = create_release() + f8 = create_release('8', dist='dist-f') + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7', + 'type_' : 'bugfix', + 'bugs' : '', + 'cves' : '', + 'notes' : '' + } + self.save_update(params, session) + + # Add another build, for a different release + params = { + 'builds' : 'TurboGears-1.0.2.2-2.fc7 python-sqlobject-0.8.2-1.fc8', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '1', + 'cves' : '', + 'notes' : '', + 'edited' : 'TurboGears-1.0.2.2-2.fc7' + } + + testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) + self.save_update(params, session) + logs = testutil.get_log() + assert 'Cannot add a F8 build to a F7 update. Please create a new update for python-sqlobject-0.8.2-1.fc8' in logs + def test_edit(self): session = login() create_release()

1 0

bodhi/templates
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/templates/show.kid | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit 874cb70edadef38151dc8eb3f6662c566a93be56 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 10:16:18 2010 -0500 Show the anonymous testers email address if we are logged in (#234) diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index f7c63cd..1744d42 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -245,7 +245,18 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k <blockquote> <div py:if="update.comments"> <div py:for="comment in update.get_comments()"> - <img py:attrs="{'src' : tg.url('/static/images/comment-%d.png' % comment.karma)}" hspace="3"/>${comment.anonymous and 'Anonymous Tester' or comment.author} - ${comment.timestamp} + <img py:attrs="{'src' : tg.url('/static/images/comment-%d.png' % comment.karma)}" hspace="3"/> + <div py:if="comment.anonymous"> + <div py:if="tg.identity.anonymous"> + Anonymous Tester - ${comment.timestamp} + </div> + <div py:if="not tg.identity.anonymous"> + ${comment.author} (Anonymous) - ${comment.timestamp} + </div> + </div> + <div py:if="not comment.anonymous"> + comment.author - ${comment.timestamp} + </div> <pre><div py:replace="comment.text">Comment</div></pre> </div> </div>

1 0

bodhi/controllers.py
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/controllers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit e7ec446d2277eaa16afded7eed76e0ae1557faa5 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 09:56:34 2010 -0500 Add a 'request' argument to our list API (#224) diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 63b61a4..9f1915d 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -224,11 +224,12 @@ class Root(controllers.RootController): 'count_only': validators.StringBool(), 'created_since': validators.UnicodeString(), 'pushed_since': validators.UnicodeString(), + 'request': validators.UnicodeString(), }) def list(self, release=None, bugs=None, cves=None, status=None, type_=None, package=None, mine=False, get_auth=False, username=None, start_date=None, end_date=None, count_only=False, - created_since=None, pushed_since=None, **kw): + created_since=None, pushed_since=None, request=None, **kw): """ Return a list of updates based on given parameters """ log.debug('list(%s)' % locals()) query = [] @@ -243,7 +244,7 @@ class Root(controllers.RootController): # If no arguments are specified, return the most recent updates if not release and not bugs and not cves and not status and not type_ \ and not package and not mine and not username and not created_since \ - and not pushed_since: + and not pushed_since and not request: log.debug("No arguments, returning latest") updates = PackageUpdate.select(orderBy=orderBy).reversed() num_items = updates.count() @@ -266,6 +267,8 @@ class Root(controllers.RootController): orderBy = PackageUpdate.q.date_pushed if type_: query.append(PackageUpdate.q.type == type_) + if request: + query.append(PackageUpdate.q.request == request) if mine: query.append( PackageUpdate.q.submitter == identity.current.user_name)

1 0

bodhi/templates
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/templates/pending.kid | 1 + 1 file changed, 1 insertion(+) New commits: commit ccd86c1f0ccbcb152cc28f7a28aab73cdcc9cfcc Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 09:17:38 2010 -0500 Add the [all] link back to the pending updats list (#322) diff --git a/bodhi/templates/pending.kid b/bodhi/templates/pending.kid index fbd7553..8a19767 100644 --- a/bodhi/templates/pending.kid +++ b/bodhi/templates/pending.kid @@ -15,6 +15,7 @@ href="${tg.paginate.get_href(page)}">${page}</a> ${page} + <a href="?tg_paginate_limit=${num_items}">all</a> </div> <table class="list">

1 0

2 commits - bodhi/mail.py bodhi/tests
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/mail.py | 6 +++--- bodhi/tests/test_model.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit cd3c755ae9402ffe630ca5d8c16111e5a2e1725f Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 09:09:06 2010 -0500 Update some unit tests for the new URLs diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py index c84fcaa..baa63c8 100644 --- a/bodhi/tests/test_model.py +++ b/bodhi/tests/test_model.py @@ -288,7 +288,7 @@ class TestPackageUpdate(testutil.DBTest): templates = get_template(update) assert templates assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7' - assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…', templates[0][1] + assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n---------------------------------------…', templates[0][1] def test_latest(self): update = self.get_update(name='yum-3.2.1-1.fc7') @@ -548,7 +548,7 @@ class TestPackageUpdate(testutil.DBTest): templates = get_template(update) assert templates assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7' - assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…' + assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n---------------------------------------…' class TestBugzilla(testutil.DBTest): commit 520f66a34b6e2ca64d82f9f7ebc21d73d2c682ec Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 09:07:11 2010 -0500 Apply a patch from Till Maas to s/http/https/ some of our URLs (#256) diff --git a/bodhi/mail.py b/bodhi/mail.py index 83ac27d..78a83a8 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -194,7 +194,7 @@ for more than 2 weeks if you deem it necessary. You can submit this update to be pushed to the stable repository by going to the following URL: - http://admin.fedoraproject.org/updates/request/stable/%(package)s + https://admin.fedoraproject.org/updates/request/stable/%(package)s or by running the following command with the bodhi-client: @@ -218,7 +218,7 @@ or by running the following command with the bodhi-client: To approve this update and request that it be pushed to stable, you can use the link below: - http://admin.fedoraproject.org/updates/approve/%(package)s + https://admin.fedoraproject.org/updates/approve/%(package)s """, 'fields' : lambda x: { 'package' : x.title, @@ -267,7 +267,7 @@ available at http://docs.fedoraproject.org/yum/. All packages are signed with the Fedora Project GPG key. More details on the GPG keys used by the Fedora Project can be found at -http://fedoraproject.org/keys +https://fedoraproject.org/keys -------------------------------------------------------------------------------- """

1 0

3 commits - bodhi/masher.py bodhi/model.py comps/CVS
by Luke Macken 27 Jan '10

27 Jan '10

bodhi/masher.py | 10 +++------- bodhi/model.py | 3 ++- comps/CVS/Root | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 31d8f0c475b3d0d8c4863d45de7be9081c111017 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 27 09:05:15 2010 -0500 Use the tg_url method when injecting URLs in PackageUpdate.__str__ diff --git a/bodhi/model.py b/bodhi/model.py index fee8aa8..4a7c14e 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -29,6 +29,7 @@ from turbogears.database import PackageHub from os.path import isfile, join from textwrap import wrap +from fedora.tg.util import tg_url from bodhi import buildsys, mail from bodhi.util import get_nvr, rpm_fileheader, header, get_age, get_age_in_days from bodhi.util import Singleton, authorized_user, flash_log, build_evr, url @@ -591,7 +592,7 @@ class PackageUpdate(SQLObject): subsequent_indent=' ' * 13, width=67) comments.append(u'\n'.join(text) + '\n') val += u'\n'.join(comments).lstrip() - val += u"\n %s\n" % (config.get('base_address') + url(self.get_url())) + val += u"\n %s\n" % (config.get('base_address') + tg_url(self.get_url())) return val def get_build_tag(self): commit 921f3b87657257be3e10847e0667f67b33f274d8 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 19:33:17 2010 -0500 Use subprocess.call(..., cwd=path) instead of os.chdir diff --git a/bodhi/masher.py b/bodhi/masher.py index 97ccacb..da1fb4f 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -439,17 +439,13 @@ class MashTask(Thread): our repositories """ log.debug("Updating comps...") - olddir = os.getcwd() comps_dir = config.get('comps_dir') if not exists(comps_dir): - os.chdir(dirname(comps_dir)) cmd = 'cvs -d %s co comps' % config.get('comps_cvs') log.debug("running command: %s" % cmd) - subprocess.call(cmd, shell=True) - os.chdir(comps_dir) - subprocess.call('cvs update', shell=True) - subprocess.call('make', shell=True) - os.chdir(olddir) + subprocess.call(cmd, shell=True, cwd=comps_dir) + subprocess.call('cvs update', shell=True, cwd=comps_dir) + subprocess.call('make', shell=True, cwd=comps_dir) def update_symlinks(self): """ Stage our updates repository. commit a31e1ea7305af613d7028dd1f19a555c6e5d1b3d Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 19:31:55 2010 -0500 Update our comps CVS root diff --git a/comps/CVS/Root b/comps/CVS/Root index 6369fc0..d4915b4 100644 --- a/comps/CVS/Root +++ b/comps/CVS/Root @@ -1 +1 @@ -:pserver:anonymous@cvs.fedora.redhat.com:/cvs/pkgs +:pserver:anonymous@cvs.fedoraproject.org:/cvs/pkgs

1 0

3 commits - bodhi.egg-info/SOURCES.txt bodhi/mail.py bodhi/model.py bodhi.spec bodhi/tests
by Luke Macken 26 Jan '10

26 Jan '10

bodhi.egg-info/SOURCES.txt | 1 bodhi.spec | 2 - bodhi/mail.py | 18 ++++++++++- bodhi/model.py | 12 +++++++ bodhi/tests/test_controllers.py | 61 ++++++++++++++++++++++------------------ 5 files changed, 64 insertions(+), 30 deletions(-) New commits: commit 68fb6ebdc5f29a87af3e8d909a595377fc186134 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 14:05:39 2010 -0500 Some critpath workflow changes and test improvements. - If a developer +1's a critpath update that for a pending release, and it becomes approved after, then automatically submit it to stable. - This makes it so the workflow does not require someone to come along and request that it be pushed to stable after it has the appropriate karma. diff --git a/bodhi.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt index c579c72..60b8600 100644 --- a/bodhi.egg-info/SOURCES.txt +++ b/bodhi.egg-info/SOURCES.txt @@ -166,6 +166,7 @@ bodhi/tests/__init__.py bodhi/tests/test_buildsystem.py bodhi/tests/test_client.py bodhi/tests/test_controllers.py +bodhi/tests/test_masher.py bodhi/tests/test_metadata.py bodhi/tests/test_model.py bodhi/tests/test_util.py diff --git a/bodhi.spec b/bodhi.spec index 663ba19..e40e5a3 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -3,7 +3,7 @@ Name: bodhi Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet License: GPLv2+ diff --git a/bodhi/mail.py b/bodhi/mail.py index 7cad3ee..83ac27d 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -433,7 +433,7 @@ def send(to, msg_type, update, sender=None): to = [to] for person in to: send_mail(sender, person, '[Fedora Update] %s[%s] %s' % ( - if update.critpath and '[CRITPATH] ' or '', + update.critpath and '[CRITPATH] ' or '', msg_type, update.title), messages[msg_type]['body'] % messages[msg_type]['fields'](update)) diff --git a/bodhi/model.py b/bodhi/model.py index 00d69bf..fee8aa8 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -689,9 +689,11 @@ class PackageUpdate(SQLObject): as stable. If it reaches the 'unstable_karma', it is unpushed. """ if not author: author = identity.current.user_name + critpath_approved = self.critpath_approved # Hack: Add admin groups to usernames (eg: "lmacken (releng)") admin_groups = config.get('admin_groups', 'releng qa security_respons').split() + for group in identity.current.groups: if group in admin_groups: author += ' (%s)' % group @@ -736,6 +738,14 @@ class PackageUpdate(SQLObject): people.add(comment.author.split()[0]) mail.send(people, 'comment', self) + # If we're a Critical Path update for a pending release + if self.critpath and self.release.locked: + # If we weren't approved before, and now are, push to stable + if not critpath_approved and self.critpath_approved: + self.comment('Critical path update approved', author='bodhi') + self.request = 'stable' + mail.send_admin('critpath_approved', self) + def unpush(self): """ Move this update back to its dist-fX-updates-candidate tag """ koji = buildsys.get_session() diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index de6755e..b998952 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1285,6 +1285,14 @@ class TestControllers(testutil.DBTest): assert "Push to Stable" in cherrypy.response.body[0] assert "Push to Testing" in cherrypy.response.body[0] + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='GET', headers=session) + update = PackageUpdate.byTitle(params['builds']) + + # We're allowing devs to still request critpath updates to stable + # without a karma prerequisite for non-pending releases. + assert update.request == 'stable' + def test_non_critpath_actions_in_normal_release(self): session = login() create_release() @@ -1324,27 +1332,10 @@ class TestControllers(testutil.DBTest): update = PackageUpdate.byTitle(params['builds']) assert update.request == 'testing' - def test_push_critpath_to_frozen_release_and_request_stable(self): - session = login() - create_release(locked=True) - params = { - 'builds' : 'kernel-2.6.31-1.fc7', - 'release' : 'Fedora 7', - 'type_' : 'bugfix', - 'bugs' : '', - 'notes' : 'foobar', - 'stable_karma' : 1, - 'request': 'stable', - 'unstable_karma' : -1, - } - self.save_update(params, session) - update = PackageUpdate.byTitle(params['builds']) - assert update.request == 'testing' - # Ensure we can't create a stable request testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) testutil.create_request('/updates/request/stable/%s' % params['builds'], - method='POST', headers=session) + method='POST', headers=session) log = testutil.get_log() assert "Forcing critical path update into testing" in log update = PackageUpdate.byTitle(params['builds']) @@ -1367,6 +1358,15 @@ class TestControllers(testutil.DBTest): update = PackageUpdate.byTitle(params['builds']) assert update.request == 'testing' + # Ensure we can't create a stable request + testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='POST', headers=session) + log = testutil.get_log() + assert "Critical path update not yet approved!" in log, log + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + def test_critpath_to_frozen_release_available_actions(self): """ Ensure devs can attempt to push critpath updates for pending releases @@ -1435,6 +1435,15 @@ class TestControllers(testutil.DBTest): assert len(update.comments) == 1 assert update.comments[0].author == 'bob' + # Make sure not even releng can submit it to stable until it gets another + # approval + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='GET', headers=releng) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + assert update.karma == 1 + update.request = None + # Have another developer +1 it, so it gets up to +2 # Ensure we can't push it to stable, until we get admin approval testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % @@ -1444,8 +1453,11 @@ class TestControllers(testutil.DBTest): method='GET', headers=login(username='foobar')) assert "Push Critical Path update to Stable" not in cherrypy.response.body[0] update = PackageUpdate.byTitle(params['builds']) - assert not update.request assert update.karma == 2 + assert update.request == 'stable' + + # Reset it, and have releng approve it as well + update.request = None # Have releng try again, and ensure it can be pushed to stable testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % @@ -1569,15 +1581,10 @@ class TestControllers(testutil.DBTest): headers=login(username='bob')) update = PackageUpdate.byTitle(params['builds']) - assert len(update.comments) == 2 + assert len(update.comments) == 3, update.comments assert update.comments[1].author == 'bob', update.comments - - testutil.create_request('/updates/%s' % params['builds'], - method='GET', headers=session) - update = PackageUpdate.byTitle(params['builds']) - assert update.comments[0].author == 'guest (qa)' - - assert "Mark Critical Path update as Stable" in cherrypy.response.body[0], cherrypy.response.body[0] + assert update.comments[2].author == 'bodhi', update.comments + assert update.comments[2].text == 'Critical path update approved' def test_created_since(self): session = login() commit b4814867cacae7f1f52b008545eea20291f4b900 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 13:52:08 2010 -0500 Send an email to releng once critical path updates get approved diff --git a/bodhi/mail.py b/bodhi/mail.py index 1842e17..7cad3ee 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -227,6 +227,19 @@ the link below: } }, + 'critpath_approved' : { + 'body' : u"""\ +The Critical Path update `%(package)s` has been approved. + +%(updatestr)s + +""", + 'fields' : lambda x: { + 'package' : x.title, + 'updatestr' : unicode(x) + } + }, + } fedora_errata_template = u"""\ diff --git a/bodhi/model.py b/bodhi/model.py index 9a0ecbb..00d69bf 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -414,9 +414,11 @@ class PackageUpdate(SQLObject): for group in identity.current.groups: if group in admin_groups: if not self.critpath_approved: + log.info("Critical path update not yet approved!") action = 'testing' self.comment('Critical path update approved', author=identity.current.user_name) + mail.send_admin('critpath_approved', self) break else: log.info('Forcing critical path update into testing') commit d38f67834943129ea857a3fce3e9e9677a6ee0e4 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 13:39:23 2010 -0500 Mark emails to admins as [CRITPATH] when necessary diff --git a/bodhi/mail.py b/bodhi/mail.py index 6c11187..1842e17 100644 --- a/bodhi/mail.py +++ b/bodhi/mail.py @@ -419,8 +419,9 @@ def send(to, msg_type, update, sender=None): if type(to) not in (list, set, tuple): to = [to] for person in to: - send_mail(sender, person, '[Fedora Update] [%s] %s' % (msg_type, - update.title), messages[msg_type]['body'] % + send_mail(sender, person, '[Fedora Update] %s[%s] %s' % ( + if update.critpath and '[CRITPATH] ' or '', + msg_type, update.title), messages[msg_type]['body'] % messages[msg_type]['fields'](update)) def send_releng(subject, body):

1 0

bodhi/model.py
by Luke Macken 26 Jan '10

26 Jan '10

bodhi/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e159695356bb284d4f18d6f06b9a0d7956c7f3f Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 15:18:56 2010 -0500 Use our configurable admin_groups, instea of hardcoding it diff --git a/bodhi/model.py b/bodhi/model.py index 3570630..9a0ecbb 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -861,7 +861,7 @@ class PackageUpdate(SQLObject): # Hack, to get this working for F13 w/o changing the DB if comment.author.endswith(')'): group = comment.author[:-1].split('(')[-1] - if group in ('qa', 'releng'): + if group in config.get('admin_groups', 'qa releng').split(): approvals += 1 return approvals

1 0

Branch 'tg2' - bodhi/bodhi
by Luke Macken 26 Jan '10

26 Jan '10

bodhi/bodhi/model/model.py | 1 + 1 file changed, 1 insertion(+) New commits: commit 6b1c74ea59e351827e51063ede5c1da01b028534 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 26 10:19:51 2010 -0500 Add a timestamp column to our Comment model diff --git a/bodhi/bodhi/model/model.py b/bodhi/bodhi/model/model.py index 3012f8d..b89ffdd 100644 --- a/bodhi/bodhi/model/model.py +++ b/bodhi/bodhi/model/model.py @@ -771,6 +771,7 @@ class Comment(DeclarativeBase): text = Column(UnicodeText) anonymous = Column(Boolean, default=False) update_id = Column('update_id', Integer, ForeignKey('updates.id')) + timestamp = Column(DateTime, default=datetime.utcnow) def __str__(self): karma = '0'

1 0

[TG2] Release announce list
by Josh Kayse 23 Jan '10

23 Jan '10

I noticed that in development.ini there are variables for fedora_announce_list etc, why not move those to be a field of the release rather than a variable? That way it is more easily tweaked. Thoughts? PS: I hope to get some coding for the TG2 branch this weekend. -josh -- A: No. Q: Should I include quotations after my reply? Don't top post: see http://www.caliburn.nl/topposting.html for more.

1 1

[TG2] Update
by Josh Kayse 23 Jan '10

23 Jan '10

I've started work on creating the templates for the TG2 branch. So far I have started work on the master.html for the site. You can find my work on http://fedorapeople.org/gitweb?p=joshkayse/public_git/bodhi.git Some of the things that are still broken are the search form and some of the visuals Comments welcome. -josh

2 3

3 commits - bodhi/masher.py bodhi/tests
by Luke Macken 22 Jan '10

22 Jan '10

bodhi/masher.py | 5 ++++- bodhi/tests/test_model.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 8bc40b239e5525dce21d60b528c250a306538738 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 09:26:21 2010 -0500 Minor test case tweak diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py index f2c802f..c84fcaa 100644 --- a/bodhi/tests/test_model.py +++ b/bodhi/tests/test_model.py @@ -420,7 +420,7 @@ class TestPackageUpdate(testutil.DBTest): up.status = 'testing' up.status_comment() assert len(up.comments) == 1 - assert up.comments[0].author == 'bodhi' + assert up.comments[0].author == 'bodhi', up.comments[0] assert up.comments[0].text == 'This update has been pushed to testing' up.status = 'stable' up.status_comment() commit 49a464593f20cb29ecc44251cc3d6e520548a7a4 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 09:25:55 2010 -0500 Support passing update titles instead of PackageUpdate instances to the MashTask thread diff --git a/bodhi/masher.py b/bodhi/masher.py index 9b3edf0..97ccacb 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -167,6 +167,8 @@ class MashTask(Thread): self.id = id self.tag = None self.updates = set() + if isinstance(updates[0], basestring): + updates = map(PackageUpdate.byTitle, updates) map(self.updates.add, updates) if self.updates: up = self.updates.pop() commit 40b27aff2202bcb0443a56a5f7ad2c11b37baa0c Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 09:25:37 2010 -0500 Only remove the masher thread if it exists diff --git a/bodhi/masher.py b/bodhi/masher.py index 6ae1ee6..9b3edf0 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -91,7 +91,8 @@ class Masher(object): self.last_log = thread.log mail.send_releng('Bodhi Masher Report %s' % time.strftime("%y%m%d.%H%M"), thread.report()) - self._threads.remove(thread) + if thread in self._threads: + self._threads.remove(thread) del thread if len(self._threads) == 0: if len(self._queue):

1 0

Branch 'tg2' - bodhi/bodhi
by Luke Macken 22 Jan '10

22 Jan '10

bodhi/bodhi/mail.py | 2 +- bodhi/bodhi/model/model.py | 31 +++++++++++++++++-------------- bodhi/bodhi/tests/models/test_model.py | 11 ++++++----- 3 files changed, 24 insertions(+), 20 deletions(-) New commits: commit 64a46c38cd8b20b8a021d5939528f7ecda76cfbe Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 09:15:58 2010 -0500 Fix a bug with our Bug model diff --git a/bodhi/bodhi/mail.py b/bodhi/bodhi/mail.py index 470bd92..1468165 100644 --- a/bodhi/bodhi/mail.py +++ b/bodhi/bodhi/mail.py @@ -354,7 +354,7 @@ def get_template(update, use_template='fedora_errata_template'): bug.title != 'Invalid bug number') and \ ' - %s' % bug.title or '' info['references'] += u" [ %d ] Bug #%d%s\n %s\n" % \ - (i, bug.bz_id, title, bug.get_url()) + (i, bug.bug_id, title, bug.get_url()) i += 1 for cve in update.cves: info['references'] += u" [ %d ] %s\n %s\n" % \ diff --git a/bodhi/bodhi/model/model.py b/bodhi/bodhi/model/model.py index 9aaf4f3..3012f8d 100644 --- a/bodhi/bodhi/model/model.py +++ b/bodhi/bodhi/model/model.py @@ -580,16 +580,19 @@ class Update(DeclarativeBase): if not config.get('bodhi_email'): log.warning("No bodhi_email defined; not fetching bug details") fetchdetails = False + to_remove = [] for bug in self.bugs: if bug.bug_id not in bugs: + to_remove.append(bug) + if to_remove: + for bug in to_remove: self.bugs.remove(bug) if len(bug.updates) == 0: log.debug("Destroying stray Bugzilla #%d" % bug.bug_id) DBSession.delete(bug) for bug in bugs: - try: - bz = Bug.query.filter_by(bug_id=bug).one() - except: # TODO: Catch sqlalchemy's not found exception + bz = DBSession.query(Bug).filter_by(bug_id=bug).first() + if not bz: if fetchdetails: bugzilla = Bug.get_bz() newbug = bugzilla.getbug(bug) @@ -600,7 +603,7 @@ class Update(DeclarativeBase): if bz not in self.bugs: self.bugs.append(bz) DBSession.save(bz) - DBSession.flush() + DBSession.flush() def update_cves(self, cves): """ @@ -838,7 +841,7 @@ class Bug(DeclarativeBase): if not bug: bz = Bugzilla.get_bz() try: - bug = bz.getbug(self.bz_id) + bug = bz.getbug(self.bug_id) except xmlrpclib.Fault, f: self.title = 'Invalid bug number' log.warning("Got fault from Bugzilla: %s" % str(f)) @@ -870,12 +873,12 @@ class Bug(DeclarativeBase): bz = Bugzilla.get_bz() if not comment: comment = self._default_message(update) - log.debug("Adding comment to Bug #%d: %s" % (self.bz_id, comment)) + log.debug("Adding comment to Bug #%d: %s" % (self.bug_id, comment)) try: - bug = bz.getbug(self.bz_id) + bug = bz.getbug(self.bug_id) bug.addcomment(comment) except Exception, e: - log.error("Unable to add comment to bug #%d\n%s" % (self.bz_id, + log.error("Unable to add comment to bug #%d\n%s" % (self.bug_id, str(e))) def testing(self, update): @@ -885,25 +888,25 @@ class Bug(DeclarativeBase): """ bz = Bugzilla.get_bz() comment = self._default_message(update) - log.debug("Setting Bug #%d to ON_QA" % self.bz_id) + log.debug("Setting Bug #%d to ON_QA" % self.bug_id) try: - bug = bz.getbug(self.bz_id) + bug = bz.getbug(self.bug_id) bug.setstatus('ON_QA', comment=comment) except Exception, e: - log.error("Unable to alter bug #%d\n%s" % (self.bz_id, str(e))) + log.error("Unable to alter bug #%d\n%s" % (self.bug_id, str(e))) def close_bug(self, update): bz = Bugzilla.get_bz() try: ver = '-'.join(get_nvr(update.builds[0].nvr)[-2:]) - bug = bz.getbug(self.bz_id) + bug = bz.getbug(self.bug_id) bug.close('NEXTRELEASE', fixedin=ver) except xmlrpclib.Fault, f: - log.error("Unable to close bug #%d: %s" % (self.bz_id, str(f))) + log.error("Unable to close bug #%d: %s" % (self.bug_id, str(f))) # TODO: remove this def get_url(self): - return "https://bugzilla.redhat.com/show_bug.cgi?id=%s" % self.bz_id + return "https://bugzilla.redhat.com/show_bug.cgi?id=%s" % self.bug_id # TODO; put this somewhere else! diff --git a/bodhi/bodhi/tests/models/test_model.py b/bodhi/bodhi/tests/models/test_model.py index b82ecb7..1a0476f 100644 --- a/bodhi/bodhi/tests/models/test_model.py +++ b/bodhi/bodhi/tests/models/test_model.py @@ -252,18 +252,19 @@ class TestUpdate(ModelTest): def test_update_bugs(self): update = self.obj + eq_(len(update.bugs), 2) # try just adding bugs bugs = ['1234'] update.update_bugs(bugs) eq_(len(update.bugs), 1) - eq_(update.bugs[0].bz_id, 1234) + eq_(update.bugs[0].bug_id, 1234) # try just removing bugs = [] update.update_bugs(bugs) - assert len(update.bugs) == 0 - eq_(model.DBSession.query(model.Bugzilla).filter_by(bz_id=1234).first(), None) + eq_(len(update.bugs), 0) + eq_(model.DBSession.query(model.Bug).filter_by(bug_id=1234).first(), None) # Test new duplicate bugs bugs = ['1234', '1234'] @@ -274,7 +275,7 @@ class TestUpdate(ModelTest): bugs = ['4321'] update.update_bugs(bugs) assert len(update.bugs) == 1 - assert update.bugs[0].bz_id == 4321 - eq_(model.DBSession.query(model.Bugzilla).filter_by(bz_id=1234).first(), None) + assert update.bugs[0].bug_id == 4321 + eq_(model.DBSession.query(model.Bug).filter_by(bug_id=1234).first(), None) # test multibuild update

1 0

Changes to 'tg2'
by Luke Macken 22 Jan '10

22 Jan '10

New branch 'tg2' available with the following commits: commit c50bcbc125c5b1c6e2bd2d5bd1f5efd6b357382e Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 08:40:14 2010 -0500 Add the old mail module commit e0f7f93c2a92ea882671634e001983e1962a9000 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 08:39:56 2010 -0500 More model improvements & test cases commit 8720feafaed8a2031b129fc3762ddbdf1f4265cf Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 08:37:51 2010 -0500 Enable the new TurboMail in our globals commit 2f03d4b402d1878d29b9bee48cd899d143fa6aff Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 22 08:37:36 2010 -0500 Remove some irrelevant test cases commit 557452d8b1c17b3521f840244a87c9ab16102f43 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 5 10:23:59 2009 -0500 Get the Update.assign_id method ported to SQLAlchemy, and get the tests working commit c05d247cbdfe03d21c81f072400ac43b9884357d Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 5 10:23:46 2009 -0500 Have bodhi.util.header return a unicode string commit 9719c477069bdc9dfe404136c9749b188fa86122 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 5 10:23:31 2009 -0500 s/type/type_/ commit 4532a6809ff4e2c1fec05a97f89a61b05f114223 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 5 10:23:17 2009 -0500 More model tweaks commit 2471e8245f20139ae7499c1762445e34f5aba73c Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Nov 5 10:22:50 2009 -0500 Get the Update.__str__ working commit 003ebc9de5d1880a1f98970c5d54dd433d886828 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Oct 19 07:17:55 2009 -0400 More model improvements & tests commit bccd089e74a6a4e130f7a0b8be70cc8815cf734b Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Oct 16 17:46:28 2009 -0400 Initial commit of bodhi v2.0 TG2 quickstart, SQLAlchemy model, and tests commit 51e05d9b2d2a97c616f479c2f7a37567eafe2974 Merge: b64602eb55e22b45658c858d8de03c208dc0556c 11630abc65822c1e75ad5ee1dc30ed8fc77fd7dc Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Oct 15 05:21:10 2009 -0400 Merge branch 'master' into tg2 commit b64602eb55e22b45658c858d8de03c208dc0556c Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Oct 12 10:57:29 2009 -0400 Remove the egg info commit 49321550ad7ac4a0f3c16e9a2c9cd46823df6e61 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Oct 12 10:56:18 2009 -0400 Move the old bodhi code out of the way

1 0

bodhi/metrics.py bodhi/model.py
by Luke Macken 20 Jan '10

20 Jan '10

bodhi/metrics.py | 6 +++--- bodhi/model.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 9dfa6f594a6e643ab8a267238c025d9f43cdad8d Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 20 10:45:44 2010 -0500 Strip off our group name from the comment author in a few places diff --git a/bodhi/metrics.py b/bodhi/metrics.py index 0c0c529..a7e504f 100644 --- a/bodhi/metrics.py +++ b/bodhi/metrics.py @@ -290,9 +290,9 @@ class TopTestersMetric(Metric): for comment in update.comments: if comment.author == 'bodhi' or comment.karma == 0: continue - if not self.data.has_key(comment.author): - self.data[comment.author] = 0 - self.data[comment.author] += 1 + if not self.data.has_key(comment.author.split()[0]): + self.data[comment.author.split()[0]] = 0 + self.data[comment.author.split()[0]] += 1 def done(self): items = self.data.items() diff --git a/bodhi/model.py b/bodhi/model.py index e25ab34..3570630 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -731,7 +731,7 @@ class PackageUpdate(SQLObject): for comment in self.comments: if comment.anonymous or comment.author == 'bodhi': continue - people.add(comment.author) + people.add(comment.author.split()[0]) mail.send(people, 'comment', self) def unpush(self):

1 0

bodhi/config bodhi/model.py bodhi/templates bodhi/tests
by Luke Macken 20 Jan '10

20 Jan '10

bodhi/config/app.cfg | 6 ++ bodhi/model.py | 42 +++++++++++++++++-- bodhi/templates/show.kid | 6 +- bodhi/tests/test_controllers.py | 85 ++++++++++++++++++++++++++++++++++++---- 4 files changed, 124 insertions(+), 15 deletions(-) New commits: commit 4a9336f4b911d52843b6e6ee3f86b4fc31c39a75 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 20 10:37:51 2010 -0500 Require one admin +1, and a minimum karma of +2 before pushing critical path packages to pending releases. diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg index 2c94f87..317d7b5 100644 --- a/bodhi/config/app.cfg +++ b/bodhi/config/app.cfg @@ -74,7 +74,7 @@ release_team_address = None security_team = None # Superuser groups -admin_groups = 'releng security_respons cvsadmin' +admin_groups = 'releng security_respons cvsadmin qa' # Where do we send update announcements to ? # These variables should be named per: Release.prefix_id.lower()_announce_list @@ -155,6 +155,10 @@ tgcaptcha.key = 'Y`h`f&s}TZz' ## http://kojipkgs.fedoraproject.org/mash/rawhide-20100107/logs/critpath.txt critpath = "ConsoleKit ConsoleKit-libs ConsoleKit-x11 DeviceKit-power GConf2 GConf2-gtk MAKEDEV ModemManager NetworkManager NetworkManager-glib ORBit2 acl alsa-lib anaconda anaconda-yum-plugins at-spi atk attr audit audit-libs authconfig authconfig-gtk avahi avahi-autoipd avahi-glib basesystem bash binutils bluecurve-cursor-theme bzip2 bzip2-libs c-ares ca-certificates cairo checkpolicy chkconfig cloog-ppl compat-db47 comps-extras constantine-backgrounds constantine-backgrounds-single control-center control-center-filesystem coreutils coreutils-libs cpio cpp cracklib cracklib-dicts cracklib-python createrepo cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups-libs curl cyrus-sasl cyrus-sasl-lib dash db4 db4-utils dbus dbus-glib dbus-libs dbus-python dbus-x11 deltarpm desktop-backgrounds-basic desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs dhclient diffutils dmidecode dmraid dmraid-events dnsmasq dosfstools dracut e2fsprogs e2fsprogs-libs efibootmgr eggdbus elfutils elfutils-libelf elfutils-libs ethtool evolution-data-server expat fedora-gnome-theme fedora-icon-theme fedora-logos fedora-release fedora-setup-keyboard file file-libs filesystem findutils fipscheck fipscheck-lib firstboot flac fontconfig freetype gamin gawk gcc gcc-c++ gdbm gdm genisoimage glib2 glibc glibc-common glibc-devel glibc-headers gmp gnome-desktop gnome-icon-theme gnome-keyring gnome-keyring-pam gnome-menus gnome-panel-libs gnome-python2 gnome-python2-canvas gnome-python2-gnome gnome-python2-gnomevfs gnome-session gnome-settings-daemon gnome-themes gnome-vfs2 gnupg2 gnutls gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal hal-info hal-libs hdparm hesiod hicolor-icon-theme hostname hwdata info initscripts iptables iptables-ipv6 iputils iscsi-initiator-utils iso-codes isomd5sum jasper-libs kbd kernel kernel-headers keyutils-libs koji kpartx krb5-libs less libICE libIDL libSM libX11 libX11-common libXScrnSaver libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXfont libXft libXi libXinerama libXmu libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86misc libXxf86vm libacl libart_lgpl libasyncns libattr libblkid libbonobo libbonoboui libcanberra libcanberra-gtk2 libcap libcap-ng libcom_err libcroco libcurl libdaemon libdrm libedit libffi libfontenc libgail-gnome libgcc libgcrypt libglade2 libgnome libgnomecanvas libgnomekbd libgnomeui libgomp libgpg-error libgsf libgudev1 libgweather libical libidn libjpeg libmcpp libnl libnotify libogg libpcap libpciaccess libpng libproxy libproxy-bin libproxy-python librsvg2 libselinux libselinux-python libselinux-utils libsemanage libsepol libsndfile libsoup libss libssh2 libstdc++ libstdc++-devel libtasn1 libtdb libthai libtiff libtool-ltdl libudev libusb libuser libuser-python libutempter libuuid libvorbis libwnck libx86 libxcb libxkbfile libxklavier libxml2 libxml2-python libxslt linux-firmware livecd-tools logrotate lua lvm2 lvm2-libs lzma lzma-libs m4 makebootfat mash mcpp mdadm metacity mingetty mobile-broadband-provider-info module-init-tools mpfr mtools mysql-libs nash ncurses ncurses-base ncurses-libs net-tools newt newt-python notification-daemon notification-daemon-engine-slider nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util ntp ntpdate openldap openssh openssh-clients openssh-server openssl pam pango parted passwd patch pciutils-libs pcre perl perl-Crypt-PasswdMD5 perl-Digest-SHA1 perl-Module-Pluggable perl-Pod-Escapes perl-Pod-Simple perl-libs perl-version pinentry pixman pkgconfig plymouth plymouth-gdm-hooks plymouth-libs plymouth-scripts plymouth-utils pm-utils policycoreutils polkit polkit-desktop-policy polkit-gnome popt postfix ppl ppp procmail procps psmisc pth pulseaudio-gdm-hooks pulseaudio-libs pulseaudio-libs-glib2 pungi pyOpenSSL pycairo pygobject2 pygpgme pygtk2 pygtk2-libglade pykickstart pyparted python python-bugzilla python-cryptsetup python-decorator python-deltarpm python-ethtool python-imgcreate python-iniparse python-kid python-krbV python-libs python-meh python-nss python-pyblock python-pycurl python-slip python-urlgrabber pyxf86config radeontool rarian rarian-compat readline redhat-menus redhat-rpm-config repoview rootfiles rpm rpm-build rpm-libs rpm-python rsyslog sed selinux-policy selinux-policy-targeted sendmail setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang sound-theme-freedesktop sqlite squashfs-tools startup-notification sudo sysklogd syslinux system-config-date system-config-firewall-base system-config-keyboard system-config-users sysvinit-tools tar tcp_wrappers-libs tzdata udev unique unzip upstart usermode usermode-gtk ustr util-linux-ng vbetool vim-minimal which wpa_supplicant xcb-util xdg-utils xkeyboard-config xml-common xorg-x11-drivers xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-drv-ast xorg-x11-drv-ati xorg-x11-drv-cirrus xorg-x11-drv-dummy xorg-x11-drv-elographics xorg-x11-drv-evdev xorg-x11-drv-fbdev xorg-x11-drv-fpit xorg-x11-drv-geode xorg-x11-drv-glint xorg-x11-drv-hyperpen xorg-x11-drv-i128 xorg-x11-drv-i740 xorg-x11-drv-intel xorg-x11-drv-keyboard xorg-x11-drv-mach64 xorg-x11-drv-mga xorg-x11-drv-mouse xorg-x11-drv-mutouch xorg-x11-drv-neomagic xorg-x11-drv-nouveau xorg-x11-drv-nv xorg-x11-drv-openchrome xorg-x11-drv-penmount xorg-x11-drv-r128 xorg-x11-drv-rendition xorg-x11-drv-s3virge xorg-x11-drv-savage xorg-x11-drv-siliconmotion xorg-x11-drv-sis xorg-x11-drv-sisusb xorg-x11-drv-synaptics xorg-x11-drv-tdfx xorg-x11-drv-trident xorg-x11-drv-v4l xorg-x11-drv-vesa xorg-x11-drv-vmmouse xorg-x11-drv-vmware xorg-x11-drv-void xorg-x11-drv-voodoo xorg-x11-drv-wacom xorg-x11-server-Xorg xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xinit xorg-x11-xkb-utils xz xz-libs yum yum-metadata-parser yum-utils zenity zlib" +# The number of admin approvals it takes to be able to push a critical path +# update to stable for a pending release. +critpath.num_admin_approvals = 1 +critpath.min_karma = 2 # The commented out values below are the defaults diff --git a/bodhi/model.py b/bodhi/model.py index 3428379..e25ab34 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -410,10 +410,14 @@ class PackageUpdate(SQLObject): # [No Frozen Rawhide] Disable pushing critical path updates for # pending releases directly to stable. if action == 'stable' and self.release.locked and self.critpath: - if ('releng' in identity.current.groups or - 'qa' in identity.current.groups): - self.comment('Critical path update approved by %s' % - identity.current.user_name, author='bodhi') + admin_groups = config.get('admin_groups', 'qa releng').split() + for group in identity.current.groups: + if group in admin_groups: + if not self.critpath_approved: + action = 'testing' + self.comment('Critical path update approved', + author=identity.current.user_name) + break else: log.info('Forcing critical path update into testing') action = 'testing' @@ -683,6 +687,14 @@ class PackageUpdate(SQLObject): as stable. If it reaches the 'unstable_karma', it is unpushed. """ if not author: author = identity.current.user_name + + # Hack: Add admin groups to usernames (eg: "lmacken (releng)") + admin_groups = config.get('admin_groups', 'releng qa security_respons').split() + for group in identity.current.groups: + if group in admin_groups: + author += ' (%s)' % group + break + if not anonymous and karma != 0 and \ not filter(lambda c: c.author == author and c.karma == karma, self.comments): @@ -706,6 +718,7 @@ class PackageUpdate(SQLObject): log.info("Automatically unpushing %s" % self.title) self.obsolete() mail.send(self.submitter, 'unstable', self) + Comment(text=text, karma=karma, update=self, author=author, anonymous=anonymous) @@ -838,6 +851,27 @@ class PackageUpdate(SQLObject): break return critical + @property + def num_admin_approvals(self): + """ Return the number of Releng/QA approvals of this update """ + approvals = 0 + for comment in self.comments: + # FIXME: + # We need to actually store the groups or approvals sanely. + # Hack, to get this working for F13 w/o changing the DB + if comment.author.endswith(')'): + group = comment.author[:-1].split('(')[-1] + if group in ('qa', 'releng'): + approvals += 1 + return approvals + + @property + def critpath_approved(self): + """ Return whether or not this critpath update has been approved """ + return self.num_admin_approvals >= config.get( + 'critpath.num_admin_approvals', 2) and \ + self.karma >= config.get('critpath.min_karma', 2) + class Comment(SQLObject): timestamp = DateTimeCol(default=datetime.utcnow) diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index 2fa903b..f7c63cd 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -71,7 +71,7 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k Push to Testing </a> </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> @@ -81,7 +81,7 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> @@ -120,7 +120,7 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 4ba206e..de6755e 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1201,7 +1201,6 @@ class TestControllers(testutil.DBTest): assert 'TurboGears-1.0.2.2-2.fc7' in json assert json['TurboGears-1.0.2.2-2.fc7']['notes'] == 'foobar' - def test_updating_build_during_edit(self): session = login() create_release() @@ -1366,7 +1365,7 @@ class TestControllers(testutil.DBTest): } self.save_update(params, session) update = PackageUpdate.byTitle(params['builds']) - assert update.request == 'stable' + assert update.request == 'testing' def test_critpath_to_frozen_release_available_actions(self): """ @@ -1398,11 +1397,12 @@ class TestControllers(testutil.DBTest): update = PackageUpdate.byTitle(params['builds']) assert update.request == 'testing' - def test_critpath_to_frozen_release_available_actions_for_releng(self): + def test_critpath_to_pending_release_num_approved_comments(self): """ Ensure releng/qa can push critpath updates to stable for pending releases + after 1 releng/qa karma, and 1 other karma """ - session = login(group='releng') + releng = login(group='releng') create_release(locked=True) params = { 'builds' : 'kernel-2.6.31-1.fc7', @@ -1414,14 +1414,62 @@ class TestControllers(testutil.DBTest): 'request': None, 'unstable_karma' : -1, } - self.save_update(params, session) + self.save_update(params, releng) update = PackageUpdate.byTitle(params['builds']) testutil.create_request('/updates/%s' % params['builds'], - method='GET', headers=session) + method='GET', headers=releng) + # Ensure releng/QA can't push critpath updates alone assert "Push to Testing" in cherrypy.response.body[0] + assert "Push Critical Path update to Stable" not in cherrypy.response.body[0] + + # Have a developer +1 the update + developer = login(username='bob') + testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % + params['builds'], method='POST', headers=developer) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=developer) + assert "Push Critical Path update to Stable" not in cherrypy.response.body[0] + update = PackageUpdate.byTitle(params['builds']) + assert not update.request + assert len(update.comments) == 1 + assert update.comments[0].author == 'bob' + + # Have another developer +1 it, so it gets up to +2 + # Ensure we can't push it to stable, until we get admin approval + testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % + params['builds'], method='POST', + headers=login(username='foobar')) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=login(username='foobar')) + assert "Push Critical Path update to Stable" not in cherrypy.response.body[0] + update = PackageUpdate.byTitle(params['builds']) + assert not update.request + assert update.karma == 2 + + # Have releng try again, and ensure it can be pushed to stable + testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % + params['builds'], method='POST', headers=releng) + update = PackageUpdate.byTitle(params['builds']) + assert not update.request + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=developer) + assert "Push Critical Path update to Stable" not in cherrypy.response.body[0] + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=releng) + update = PackageUpdate.byTitle(params['builds']) + print update.comments assert "Push Critical Path update to Stable" in cherrypy.response.body[0] + testutil.create_request('/updates/request/stable/%s' % + params['builds'], method='POST', + headers=releng) + + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'stable' + def test_critpath_to_frozen_release_testing(self): """ Ensure devs can *not* push critpath updates directly to stable @@ -1506,7 +1554,30 @@ class TestControllers(testutil.DBTest): testutil.create_request('/updates/%s' % params['builds'], method='GET', headers=session) - assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] + assert "Mark Critical Path update as Stable" not in cherrypy.response.body[0] + + testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % + params['builds'], method='POST', headers=session) + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Mark Critical Path update as Stable" not in cherrypy.response.body[0] + + testutil.create_request('/updates/comment?text=foobar&title=%s&karma=1' % + params['builds'], method='POST', + headers=login(username='bob')) + + update = PackageUpdate.byTitle(params['builds']) + assert len(update.comments) == 2 + assert update.comments[1].author == 'bob', update.comments + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + update = PackageUpdate.byTitle(params['builds']) + assert update.comments[0].author == 'guest (qa)' + + assert "Mark Critical Path update as Stable" in cherrypy.response.body[0], cherrypy.response.body[0] def test_created_since(self): session = login()

1 0

2 commits - bodhi/config bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi/release.py bodhi.spec
by Luke Macken 18 Jan '10

18 Jan '10

bodhi.egg-info/PKG-INFO | 2 +- bodhi.egg-info/SOURCES.txt | 3 +++ bodhi.spec | 10 +++++++++- bodhi/config/f11-updates-testing.mash | 2 +- bodhi/config/f11-updates.mash | 2 +- bodhi/config/f12-updates-testing.mash | 17 +++++++++++++++++ bodhi/config/f12-updates.mash | 17 +++++++++++++++++ bodhi/release.py | 2 +- 8 files changed, 50 insertions(+), 5 deletions(-) New commits: commit aa8444d6d5f85d514b79b7170ed9067141380e8a Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 18 16:19:33 2010 -0500 0.7.0 release, prepping and staging for Fedora 13 diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO index bfe0150..b44e17e 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.11 +Version: 0.7.0 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.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt index 25a2421..c579c72 100644 --- a/bodhi.egg-info/SOURCES.txt +++ b/bodhi.egg-info/SOURCES.txt @@ -47,6 +47,8 @@ bodhi/config/f10-updates-testing.mash bodhi/config/f10-updates.mash bodhi/config/f11-updates-testing.mash bodhi/config/f11-updates.mash +bodhi/config/f12-updates-testing.mash +bodhi/config/f12-updates.mash bodhi/config/f7-updates-testing.mash bodhi/config/f7-updates.mash bodhi/config/f8-updates-testing.mash @@ -101,6 +103,7 @@ bodhi/static/images/revoke.png bodhi/static/images/rss.png bodhi/static/images/security.png bodhi/static/images/shadow.png +bodhi/static/images/shadow2-big.png bodhi/static/images/shadow2.png bodhi/static/images/stable-large.png bodhi/static/images/submit.png diff --git a/bodhi.spec b/bodhi.spec index 1749cde..663ba19 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.11 +Version: 0.7.0 Release: 1%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet @@ -116,6 +116,14 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py %changelog +* Mon Jan 18 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.0-1 +- 0.7.0 release, prepping for the F13 release +- Critical Path & No Frozen Rawhide proposals implemented +- Many other bugfixes, enhancements, and optimizations + +* Fri Nov 06 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.12-1 +- 0.6.12, for F12 + * Sat Sep 19 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.11-1 - 0.6.11 diff --git a/bodhi/release.py b/bodhi/release.py index 46b243c..f8d1b84 100644 --- a/bodhi/release.py +++ b/bodhi/release.py @@ -1,4 +1,4 @@ -VERSION = '0.6.11' +VERSION = '0.7.0' 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 d4df237b513c6b5bad2179c11ab4f3e74b625135 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 18 16:13:10 2010 -0500 Update our mash configurations for F12 diff --git a/bodhi/config/f11-updates-testing.mash b/bodhi/config/f11-updates-testing.mash index 72289e0..d3099fd 100644 --- a/bodhi/config/f11-updates-testing.mash +++ b/bodhi/config/f11-updates-testing.mash @@ -14,4 +14,4 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing repoviewtitle = "Fedora 11 Updates Testing - %(arch)s" arches = i386 x86_64 ppc ppc64 delta = True -delta_dirs = /pub/fedora/linux/releases/11/Everything,/mnt/koji/mash/updates/f11-updates +delta_dirs = /pub/fedora/linux/releases/11/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f11-updates/%(arch)s/ diff --git a/bodhi/config/f11-updates.mash b/bodhi/config/f11-updates.mash index 3f6a00f..d4879d1 100644 --- a/bodhi/config/f11-updates.mash +++ b/bodhi/config/f11-updates.mash @@ -14,4 +14,4 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/11/%(ar repoviewtitle = "Fedora 11 Updates - %(arch)s" arches = i386 x86_64 ppc ppc64 delta = True -delta_dirs = /pub/fedora/linux/releases/11/Everything,/mnt/koji/mash/updates/f11-updates +delta_dirs = /pub/fedora/linux/releases/11/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f11-updates/%(arch)s/ diff --git a/bodhi/config/f12-updates-testing.mash b/bodhi/config/f12-updates-testing.mash new file mode 100644 index 0000000..abd8345 --- /dev/null +++ b/bodhi/config/f12-updates-testing.mash @@ -0,0 +1,17 @@ +# mash config file + +[f12-updates-testing] +rpm_path = %(arch)s/ +source_path = SRPMS/ +debuginfo = True +multilib = True +multilib_method = devel +tag = dist-f12-updates-testing +inherit = False +strict_keys = True +keys = 57BBCCBA +repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/12/%(arc… +repoviewtitle = "Fedora 12 Updates Testing - %(arch)s" +arches = i386 x86_64 ppc ppc64 +delta = True +delta_dirs = /pub/fedora/linux/releases/12/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f12-updates/%(arch)s/ diff --git a/bodhi/config/f12-updates.mash b/bodhi/config/f12-updates.mash new file mode 100644 index 0000000..cdd4d98 --- /dev/null +++ b/bodhi/config/f12-updates.mash @@ -0,0 +1,17 @@ +# mash config file + +[f12-updates] +rpm_path = %(arch)s/ +source_path = SRPMS/ +debuginfo = True +multilib = True +multilib_method = devel +tag = dist-f12-updates +inherit = False +strict_keys = True +keys = 57BBCCBA +repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/12/%(arch)s/ +repoviewtitle = "Fedora 12 Updates - %(arch)s" +arches = i386 x86_64 ppc ppc64 +delta = True +delta_dirs = /pub/fedora/linux/releases/12/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f12-updates/%(arch)s/

1 0

2 commits - bodhi/controllers.py bodhi/tests bodhi/tools
by Luke Macken 15 Jan '10

15 Jan '10

bodhi/controllers.py | 11 ++++++-- bodhi/tests/test_controllers.py | 49 ++++++++++++++++++++++++++++++++++++++++ bodhi/tools/tagcheck.py | 4 +-- 3 files changed, 59 insertions(+), 5 deletions(-) New commits: commit 5ac115ff389c0c736d0204e6b2eda2552f30346f Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 15 15:54:59 2010 -0500 Add a pushed_since argument to our query API diff --git a/bodhi/controllers.py b/bodhi/controllers.py index f0c0605..63b61a4 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -223,11 +223,12 @@ class Root(controllers.RootController): 'username': validators.UnicodeString(), 'count_only': validators.StringBool(), 'created_since': validators.UnicodeString(), + 'pushed_since': validators.UnicodeString(), }) def list(self, release=None, bugs=None, cves=None, status=None, type_=None, package=None, mine=False, get_auth=False, username=None, start_date=None, end_date=None, count_only=False, - created_since=None, **kw): + created_since=None, pushed_since=None, **kw): """ Return a list of updates based on given parameters """ log.debug('list(%s)' % locals()) query = [] @@ -241,7 +242,8 @@ class Root(controllers.RootController): # If no arguments are specified, return the most recent updates if not release and not bugs and not cves and not status and not type_ \ - and not package and not mine and not username and not created_since: + and not package and not mine and not username and not created_since \ + and not pushed_since: log.debug("No arguments, returning latest") updates = PackageUpdate.select(orderBy=orderBy).reversed() num_items = updates.count() @@ -272,8 +274,11 @@ class Root(controllers.RootController): if created_since: created_since = datetime(*time.strptime(created_since, '%Y-%m-%d %H:%M:%S')[:-2]) - log.debug('Querying updates created since %s' % created_since) query.append(PackageUpdate.q.date_submitted >= created_since) + if pushed_since: + pushed_since = datetime(*time.strptime(pushed_since, + '%Y-%m-%d %H:%M:%S')[:-2]) + query.append(PackageUpdate.q.date_pushed >= pushed_since) if start_date: start_date = datetime(*time.strptime(start_date, '%Y-%m-%d %H:%M:%S')[:-2]) diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index b63c9c6..4ba206e 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1558,6 +1558,55 @@ class TestControllers(testutil.DBTest): json = simplejson.loads(cherrypy.response.body[0]) assert json['num_items'] == 0 + def test_pushed_since(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to stable + update.pushed = True + update.status = 'stable' + update.date_pushed = datetime(2010, 01, 01, 12, 00, 00) + + ## Test web UI + testutil.create_request('/updates/list?%s' % + urlencode({'pushed_since': str(update.date_pushed)}), + method='GET', headers=session) + + assert '1 update found' in cherrypy.response.body[0] + assert 'kernel-2.6.31-1.fc7' in cherrypy.response.body[0] + + ## Test JSON API + testutil.create_request('/updates/list?%s' % + urlencode({'pushed_since': str(update.date_pushed), + 'tg_format': 'json'}), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 1 + assert json['updates'][0]['title'] == params['builds'] + + testutil.create_request('/updates/list?%s' % + urlencode({ + 'tg_format': 'json', + 'pushed_since': str(update.date_pushed + timedelta(days=1)), + }), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 0 + def test_query_limit(self): session = login() create_release() commit 62bce2dc04fad0b8d1215b9c9679a6d039e611d3 Author: Luke Macken <lmacken(a)redhat.com> Date: Fri Jan 15 15:41:27 2010 -0500 Only compare against the latest tagged builds in bodhi-tagcheck diff --git a/bodhi/tools/tagcheck.py b/bodhi/tools/tagcheck.py index 5e54bb5..c80603f 100755 --- a/bodhi/tools/tagcheck.py +++ b/bodhi/tools/tagcheck.py @@ -35,7 +35,7 @@ def main(): # Check all candidate updates to see if they are in a different bodhi state for release in Release.select(): tag = release.candidate_tag - tagged = [build['nvr'] for build in koji.listTagged(tag)] + tagged = [build['nvr'] for build in koji.listTagged(tag, latest=True)] for nvr in tagged: try: build = PackageBuild.byNvr(nvr) @@ -58,7 +58,7 @@ def main(): # in bodhi, and are in the expect state. for release in Release.select(): for tag in (release.testing_tag, release.stable_tag): - tagged = [build['nvr'] for build in koji.listTagged(tag)] + tagged = [build['nvr'] for build in koji.listTagged(tag, latest=True)] for nvr in tagged: try: build = PackageBuild.byNvr(nvr)

1 0

bodhi/controllers.py bodhi/search.py bodhi/tests
by Luke Macken 13 Jan '10

13 Jan '10

bodhi/controllers.py | 10 ++++---- bodhi/search.py | 4 +-- bodhi/tests/test_controllers.py | 46 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 11 deletions(-) New commits: commit 2681e88dd8c5acdeedfef58d9aab5e6aa57f6fd9 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 21:59:40 2010 -0500 Fix the pagination deprecation warnings, and add a test case for our limits diff --git a/bodhi/controllers.py b/bodhi/controllers.py index bd91405..f0c0605 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -210,7 +210,7 @@ class Root(controllers.RootController): return updates @expose(template="bodhi.templates.list", allow_json=True) - @paginate('updates', limit=20, max_limit=50, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=1000) @validate(validators={ 'release': validators.UnicodeString(), 'bugs': validators.UnicodeString(), @@ -370,7 +370,7 @@ class Root(controllers.RootController): @expose(template="bodhi.templates.mine", allow_json=True) @identity.require(identity.not_anonymous()) - @paginate('updates', limit=20, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=20) def mine(self): """ List all updates submitted by the current user """ updates = PackageUpdate.select( @@ -872,7 +872,7 @@ class Root(controllers.RootController): raise redirect(updates[0].get_url()) @expose(template='bodhi.templates.list') - @paginate('updates', limit=20, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=20, max_limit=20) def default(self, *args, **kw): """ This method allows for the following requests @@ -1093,7 +1093,7 @@ class Root(controllers.RootController): raise redirect('/') @expose(template='bodhi.templates.comments') - @paginate('comments', limit=20, max_limit=20, allow_limit_override=True) + @paginate('comments', limit=20, max_limit=20) def comments(self): data = Comment.select(Comment.q.author != 'bodhi', orderBy=Comment.q.timestamp).reversed() @@ -1177,7 +1177,7 @@ class Root(controllers.RootController): return dict(updates=updates) @expose(template="bodhi.templates.user") - @paginate('updates', limit=25, max_limit=20, allow_limit_override=True) + @paginate('updates', limit=25, max_limit=20) def user(self, username): """ Return a list of updates submitted by a given person """ updates = PackageUpdate.select(PackageUpdate.q.submitter == username, diff --git a/bodhi/search.py b/bodhi/search.py index 4f13c9c..6e1913a 100644 --- a/bodhi/search.py +++ b/bodhi/search.py @@ -41,8 +41,8 @@ class SearchController(Controller): @expose(template="bodhi.templates.search") @validate(validators={ "search" : validators.UnicodeString() }) @error_handler(index) - @paginate('updates', default_order='date_submitted', default_reversed=True, - limit=25, allow_limit_override=True) + @paginate('updates', default_order='-date_submitted', + limit=20, max_limit=1000) def default(self, search, *args, **kw): results = set() diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index e066a0c..b63c9c6 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1196,7 +1196,6 @@ class TestControllers(testutil.DBTest): testutil.create_request('/updates/get_updates_from_builds?builds=' + 'kernel-2.6.29.1-111.fc7.x86_64%20TurboGears-1.0.2.2-2.fc7', method='POST') - import simplejson json = simplejson.loads(cherrypy.response.body[0]) assert 'kernel-2.6.29.1-111.fc7.x86_64' in json assert 'TurboGears-1.0.2.2-2.fc7' in json @@ -1510,9 +1509,6 @@ class TestControllers(testutil.DBTest): assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] def test_created_since(self): - """ - Ensure admins can submit critpath updates for pending releases to stable - """ session = login() create_release() params = { @@ -1561,3 +1557,45 @@ class TestControllers(testutil.DBTest): json = simplejson.loads(cherrypy.response.body[0]) assert json['num_items'] == 0 + + def test_query_limit(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + #update = PackageUpdate.byTitle(params['builds']) + + # Create 100 updates + for prefix in xrange(100): + update = params.copy() + update['builds'] = '%s%d%s' % (update['builds'][0], prefix, + update['builds'][1:]) + self.save_update(update, session) + + assert PackageUpdate.select().count() == 100, PackageUpdate.select().count() + + ## Test default limit + testutil.create_request('/updates/list?tg_format=json', method='GET', + headers=session) + + assert '100 updates found' in cherrypy.response.body[0], cherrypy.response.body[0] + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 100, json['num_items'] + assert len(json['updates']) == 20, len(json['updates']) + + ## Try getting all 100 + testutil.create_request('/updates/list?tg_format=json&tg_paginate_limit=100', + method='GET', headers=session) + + assert '100 updates found' in cherrypy.response.body[0], cherrypy.response.body[0] + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 100, json['num_items'] + assert len(json['updates']) == 100, len(json['updates'])

1 0

2 commits - bodhi/controllers.py bodhi/tests
by Luke Macken 13 Jan '10

13 Jan '10

bodhi/controllers.py | 17 ++++++++-- bodhi/tests/test_controllers.py | 64 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 9 deletions(-) New commits: commit 83250e00a8d411eb6a419d65a699bdbf22be046a Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 16:31:06 2010 -0500 Fix a bug with our tests diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 30fcb92..e066a0c 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1551,7 +1551,6 @@ class TestControllers(testutil.DBTest): assert json['num_items'] == 1 assert json['updates'][0]['title'] == params['builds'] - testutil.capture_log(['bodhi.model', 'bodhi.controllers']) testutil.create_request('/updates/list?%s' % urlencode({ 'tg_format': 'json', @@ -1561,4 +1560,4 @@ class TestControllers(testutil.DBTest): method='GET', headers=session) json = simplejson.loads(cherrypy.response.body[0]) - assert json['num_items'] == 0, testutil.get_log() + assert json['num_items'] == 0 commit c2aa41e8c61ce6041e0cce00e7923b9579c3f2a7 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 13 15:58:20 2010 -0500 Add a 'created_since' argument to our query API that returns updates that have been created since a given date. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 8af5184..bd91405 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -222,10 +222,12 @@ class Root(controllers.RootController): 'get_auth': validators.StringBool(), 'username': validators.UnicodeString(), 'count_only': validators.StringBool(), + 'created_since': validators.UnicodeString(), }) def list(self, release=None, bugs=None, cves=None, status=None, type_=None, package=None, mine=False, get_auth=False, username=None, - start_date=None, end_date=None, count_only=False, **kw): + start_date=None, end_date=None, count_only=False, + created_since=None, **kw): """ Return a list of updates based on given parameters """ log.debug('list(%s)' % locals()) query = [] @@ -239,7 +241,7 @@ class Root(controllers.RootController): # If no arguments are specified, return the most recent updates if not release and not bugs and not cves and not status and not type_ \ - and not package and not mine and not username: + and not package and not mine and not username and not created_since: log.debug("No arguments, returning latest") updates = PackageUpdate.select(orderBy=orderBy).reversed() num_items = updates.count() @@ -267,11 +269,18 @@ class Root(controllers.RootController): PackageUpdate.q.submitter == identity.current.user_name) if username: query.append(PackageUpdate.q.submitter == username) + if created_since: + created_since = datetime(*time.strptime(created_since, + '%Y-%m-%d %H:%M:%S')[:-2]) + log.debug('Querying updates created since %s' % created_since) + query.append(PackageUpdate.q.date_submitted >= created_since) if start_date: - start_date = datetime(*time.strptime(start_date, '%Y-%m-%d %H:%M:%S')[:-2]) + start_date = datetime(*time.strptime(start_date, + '%Y-%m-%d %H:%M:%S')[:-2]) query.append(PackageUpdate.q.date_pushed >= start_date) if end_date: - end_date = datetime(*time.strptime(end_date, '%Y-%m-%d %H:%M:%S')[:-2]) + end_date = datetime(*time.strptime(end_date, + '%Y-%m-%d %H:%M:%S')[:-2]) query.append(PackageUpdate.q.date_pushed <= end_date) updates = PackageUpdate.select(AND(*query), diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index c0dd645..30fcb92 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -2,23 +2,24 @@ # -*- coding: utf-8 -*- import os +import urllib +import simplejson import turbogears import cPickle as pickle -from datetime import datetime +from urllib import urlencode +from datetime import datetime, timedelta +from sqlobject import SQLObjectNotFound from turbogears import testutil, database, config turbogears.update_config(configfile='bodhi.cfg', modulename='bodhi.config') database.set_db_uri("sqlite:///:memory:") -import urllib -import cherrypy - -from sqlobject import SQLObjectNotFound from bodhi.model import Release, PackageUpdate, User, PackageBuild, Bugzilla, \ Group from bodhi.controllers import Root from bodhi.exceptions import DuplicateEntryError +import cherrypy cherrypy.root = Root() def create_release(num='7', dist='dist-fc', **kw): @@ -1507,3 +1508,57 @@ class TestControllers(testutil.DBTest): method='GET', headers=session) assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] + + def test_created_since(self): + """ + Ensure admins can submit critpath updates for pending releases to stable + """ + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to stable + update.pushed = True + update.status = 'stable' + update.date_submitted = datetime(2010, 01, 01, 12, 00, 00) + + ## Test web UI + testutil.create_request('/updates/list?%s' % + urlencode({'created_since': str(update.date_submitted)}), + method='GET', headers=session) + + assert '1 update found' in cherrypy.response.body[0], cherrypy.response.body[0] + assert 'kernel-2.6.31-1.fc7' in cherrypy.response.body[0] + + ## Test JSON API + testutil.create_request('/updates/list?%s' % + urlencode({'created_since': str(update.date_submitted), + 'tg_format': 'json'}), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 1 + assert json['updates'][0]['title'] == params['builds'] + + testutil.capture_log(['bodhi.model', 'bodhi.controllers']) + testutil.create_request('/updates/list?%s' % + urlencode({ + 'tg_format': 'json', + 'created_since': str(update.date_submitted + + timedelta(days=1)), + }), + method='GET', headers=session) + + json = simplejson.loads(cherrypy.response.body[0]) + assert json['num_items'] == 0, testutil.get_log()

1 0

bodhi.spec
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi.spec | 1 + 1 file changed, 1 insertion(+) New commits: commit f405798d726f0102fcc8695ba7b85a9d2cedf73b Author: Mathieu Bridon <bochecha(a)fedoraproject.org> Date: Sun Jan 10 19:51:15 2010 +0100 Ticket #286: Show an update example When displaying the update, parse the MarkDown syntax in the update notes to render nicely formatted HTML. This is a follow-up on commit e9318aa03cd2771fd4c4af42bd552ca465e6f3bd that introduced a new dependency on the markdown2 module. The spec file needed to be updated for the new Requires, which was forgotten in the previous commit. diff --git a/bodhi.spec b/bodhi.spec index 60e5da3..1749cde 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -58,6 +58,7 @@ Requires: python-tgcaptcha Requires: python-decorator Requires: mod_wsgi Requires: httpd +Requires: python-markdown2 %description server

1 0

2 commits - bodhi/static bodhi/templates bodhi/widgets.py
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi/static/css/layout.css | 11 +++++++++++ bodhi/static/images/shadow2-big.png |binary bodhi/templates/new.kid | 2 +- bodhi/templates/show.kid | 6 +++++- bodhi/widgets.py | 10 ++++++++-- 5 files changed, 25 insertions(+), 4 deletions(-) New commits: commit e9318aa03cd2771fd4c4af42bd552ca465e6f3bd Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Sun Aug 30 12:20:02 2009 +0200 Ticket #286: Show an update example When displaying the update, parse the MarkDown syntax in the update notes to render nicely formatted HTML. diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index e81518a..2fa903b 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -13,6 +13,8 @@ from cgi import escape from bodhi import util from turbogears import identity +from markdown2 import markdown +import re ## Link to build info and logs buildinfo = '' @@ -33,7 +35,9 @@ title = title[:-2] release = util.link(update.release.long_name, '/' + update.release.name) submitter = util.link(update.submitter, '/user/' + update.submitter) -notes = escape(update.notes).replace('\r\n', ' ') + +reg = re.compile(r'(^[-*] .*(?:\n[-*] .*)*)', re.MULTILINE) +notes = markdown(reg.sub(r'\n\1\n', escape(update.notes))) if update.karma < 0: karma = -1 elif update.karma > 0: karma = 1 commit b7f47f9f77b41556cacb2c1efa1d42079b4b8e6f Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Sun Aug 30 01:28:40 2009 +0200 Ticket #286: Show an update example New update notes tooltip now shows an example update with the use of MarkDown syntax. diff --git a/bodhi/static/css/layout.css b/bodhi/static/css/layout.css index eee822c..13d07c6 100644 --- a/bodhi/static/css/layout.css +++ b/bodhi/static/css/layout.css @@ -576,6 +576,17 @@ td.value { height: 100px; } +#tooltip.pretty-big { + width: 270px; +} + +#tooltip.pretty-big div { width: 270px; text-align: left; } + +#tooltip.fancy-big { + background: url('/updates/static/images/shadow2-big.png'); + height: 210px; +} + #main { padding: 1em; } #banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc; background: url(bg.gif) repeat-x; text-align: center } diff --git a/bodhi/static/images/shadow2-big.png b/bodhi/static/images/shadow2-big.png new file mode 100644 index 0000000..fdde8ae Binary files /dev/null and b/bodhi/static/images/shadow2-big.png differ diff --git a/bodhi/templates/new.kid b/bodhi/templates/new.kid index a6cd3a9..40c8933 100644 --- a/bodhi/templates/new.kid +++ b/bodhi/templates/new.kid @@ -24,7 +24,7 @@ fixPNG: true, opacity: 1 }); $("#form_notes").Tooltip({ - extraClass: "pretty fancy", showBody: " - ", left: 5, top: -15, + extraClass: "pretty fancy pretty-big fancy-big", showBody: " - ", left: 5, top: -15, fixPNG: true, opacity: 1 }); $("#form_bugs").Tooltip({ diff --git a/bodhi/widgets.py b/bodhi/widgets.py index bf2f98f..87141af 100644 --- a/bodhi/widgets.py +++ b/bodhi/widgets.py @@ -99,9 +99,15 @@ class NewUpdateForm(Form): 'CVE-2008-0001'}), TextArea('notes', validator=validators.UnicodeString(), rows=13, cols=65, - attrs={'title' : 'Advisory Notes - Some optional details ' + attrs={'title' : 'Advisory Notes - Some optional details ' 'about this update that will appear in ' - 'the notice'}), + 'the notice.' + 'Exemple: ' + 'This is an update that fixes problems with ' + '**connecting to a share**.' + 'The following things *break*:' + '* Browsing with `<code>gnome-app-install</code>` ' + '* Emailing'}), CheckBox(name='close_bugs', help_text='Automatically close bugs', validator=validators.StringBool(), default=True, attrs={'title' : 'Close Bugs - '

1 0

bodhi/tools
by Mathieu Bridon 10 Jan '10

10 Jan '10

bodhi/tools/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c87f4b12f87b01befedcd46a3507d8563148732a Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Thu Aug 27 22:17:28 2009 +0200 Ticket #325: Unable to download F11 (i586) update Add the support for i586 arch downloads, necessary on Fedora 11. diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py index e648aa3..77d9a7c 100755 --- a/bodhi/tools/client.py +++ b/bodhi/tools/client.py @@ -338,7 +338,7 @@ def main(): for build in update['builds']: subprocess.call('koji download-build --arch=%s ' '--arch=noarch%s %s' % (arch, - arch == 'i686' and ' --arch=i386' + arch == 'i686' and ' --arch=i386 --arch=i586' or '', build['nvr']), shell=True) else:

1 0

bodhi/templates bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/templates/show.kid | 36 ++++++++++++++++++++++--------- bodhi/tests/test_controllers.py | 46 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 11 deletions(-) New commits: commit b460f3b9ba02b9aba9ed5362dc7879df92faa402 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 22:08:20 2010 -0500 [No Frozen Rawhide] Fix some of our update action logic, along with tests diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index 8e7c8af..e81518a 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -69,14 +69,23 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - <td> - <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> - <img src="${tg.url('/static/images/submit.png')}" border="0"/> - Push Critical Path update to Stable - </a> - </td> + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push Critical Path update to Stable + </a> + </td> + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push to Stable + </a> + </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> @@ -84,7 +93,6 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </a> </td> - <td> <a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/trash.png')}" border="0"/> @@ -118,15 +126,23 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </td> - + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> Mark as Stable </a> </td> - + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark as Stable + </a> + </td> + <td> <a href="${util.url('/edit/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/edit.png')}" border="0"/> diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index ad6a029..c0dd645 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1264,6 +1264,50 @@ class TestControllers(testutil.DBTest): update = PackageUpdate.byTitle(params['builds']) assert update.request == 'stable' + def test_critpath_actions_in_normal_release(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == None + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + assert "Push to Stable" in cherrypy.response.body[0] + assert "Push to Testing" in cherrypy.response.body[0] + + def test_non_critpath_actions_in_normal_release(self): + session = login() + create_release() + params = { + 'builds' : 'nethack-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == None + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push to Stable" in cherrypy.response.body[0], cherrypy.response.body[0] + def test_push_critpath_to_frozen_release(self): session = login() create_release(locked=True) @@ -1434,7 +1478,7 @@ class TestControllers(testutil.DBTest): testutil.create_request('/updates/%s' % params['builds'], method='GET', headers=session) - assert "/updates/request/stable" in cherrypy.response.body[0] + assert "/updates/request/stable" in cherrypy.response.body[0], cherrypy.response.body[0] def test_critpath_to_frozen_release_testing_admin_actions(self): """

1 0

bodhi/controllers.py
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/controllers.py | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit c4f45b454be100820bc1ee36c2c8cabfe4bb0994 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 17:30:47 2010 -0500 After we unpush an edited update, be sure to refresh the tags (infra#3227). diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 7b134e5..8af5184 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -623,6 +623,12 @@ class Root(controllers.RootController): raise InvalidUpdateException(params) edited.unpush() + # Refresh the tags for these builds + for build in edited.builds: + if build.nvr in buildinfo: + buildinfo[build.nvr]['tags'] = [tag['name'] for tag in + koji.listTags(build.nvr)] + # Make sure all builds are tagged appropriately. We also determine # which builds get pushed for which releases, based on the tag. for build in builds:

1 0

bodhi/model.py bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/model.py | 1 + bodhi/tests/test_controllers.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 332cbb03dd7ce5cb4ea82557372ecec2df627400 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 14:12:12 2010 -0500 Fix some unit tests that I just broke diff --git a/bodhi/model.py b/bodhi/model.py index 6c93521..3428379 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -335,6 +335,7 @@ class PackageUpdate(SQLObject): time.localtime()[0],id) log.debug("Setting updateid for %s to %s" % (self.title, self.updateid)) + self.date_pushed = datetime.utcnow() hub.commit() def set_request(self, action, pathcheck=True): diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 916d297..ad6a029 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1260,7 +1260,7 @@ class TestControllers(testutil.DBTest): testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) self.save_update(params, session) log = testutil.get_log() - assert "Update successfully created. You're pushing a critical path package directly to stable. Please consider pushing to testing first!" in log, log + assert "Update successfully created. You're pushing a critical path package directly to stable, which is strongly discouraged. Please consider pushing to testing first!" in log, log update = PackageUpdate.byTitle(params['builds']) assert update.request == 'stable'

1 0

16 commits - bodhi/admin.py bodhi/config bodhi/controllers.py bodhi/masher.py bodhi/model.py bodhi/templates bodhi/tests
by Luke Macken 07 Jan '10

07 Jan '10

bodhi/admin.py | 11 + bodhi/config/app.cfg | 8 + bodhi/controllers.py | 14 ++ bodhi/masher.py | 9 + bodhi/model.py | 30 +++++ bodhi/templates/show.kid | 40 +++++-- bodhi/tests/test_controllers.py | 224 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 321 insertions(+), 15 deletions(-) New commits: commit 738f0b74947c96512034277ca0844d35200f66cd Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 13:57:49 2010 -0500 Reset the PackageUpdate.date_pushed when a testing update hits stable diff --git a/bodhi/model.py b/bodhi/model.py index a05ca2d..6c93521 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -335,7 +335,6 @@ class PackageUpdate(SQLObject): time.localtime()[0],id) log.debug("Setting updateid for %s to %s" % (self.title, self.updateid)) - self.date_pushed = datetime.utcnow() hub.commit() def set_request(self, action, pathcheck=True): @@ -434,6 +433,7 @@ class PackageUpdate(SQLObject): self.pushed = True self.status = 'testing' self.assign_id() + self.date_pushed = datetime.utcnow() elif self.request == 'obsolete': self.pushed = False self.status = 'obsolete' @@ -441,6 +441,7 @@ class PackageUpdate(SQLObject): self.pushed = True self.status = 'stable' self.assign_id() + self.date_pushed = datetime.utcnow() self.request = None hub.commit() commit 06846118dd164e89ae747caaa6997a7718739cdb Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:22:48 2010 -0500 We want to move tags for *all* updates headed to stable for pending releases, not just critical path updates. diff --git a/bodhi/masher.py b/bodhi/masher.py index e648692..6ae1ee6 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -387,7 +387,7 @@ class MashTask(Thread): self.tag = update.release.stable_tag # [No Frozen Rawhide] Move stable builds going to a pending # release to the Release.dist-tag - if update.release.locked and update.critpath: + if update.release.locked: self.tag = update.release.dist_tag elif update.request == 'testing': self.tag = update.release.testing_tag commit 290ea5e58ef2a4ed5e7843e3d4aedc2ad69af067 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:21:15 2010 -0500 Minor comment tweaks diff --git a/bodhi/masher.py b/bodhi/masher.py index 1293e75..e648692 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -385,8 +385,8 @@ class MashTask(Thread): for update in self.updates: if update.request == 'stable': self.tag = update.release.stable_tag - # [No Frozen Rawhide] Move stable builds going to a locked - # release to the dist-tag + # [No Frozen Rawhide] Move stable builds going to a pending + # release to the Release.dist-tag if update.release.locked and update.critpath: self.tag = update.release.dist_tag elif update.request == 'testing': commit ceecc97ecbe7ee44ff664235c913ffb2bdd64bbb Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:20:33 2010 -0500 Minor comment addition diff --git a/bodhi/controllers.py b/bodhi/controllers.py index b2b0c9e..7b134e5 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -838,6 +838,7 @@ class Root(controllers.RootController): note.append("You're pushing a critical path package directly to " "stable, which is strongly discouraged. Please " "consider pushing to testing first!") + # Discourage devs from pushing directly to stable for pending releases elif update.request == 'stable' and update.release.locked: note.append("This update is bypassing updates-testing for a " "pending release, which is strongly discouraged. " commit bc06073d029f623ee73f90a38fb46491480fe39d Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:18:57 2010 -0500 Discourage developers from pushing critpath packages to stable, harder. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index e7d9e7f..b2b0c9e 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -836,7 +836,8 @@ class Root(controllers.RootController): 'qa' not in identity.current.groups and 'releng' not in identity.current.groups): note.append("You're pushing a critical path package directly to " - "stable. Please consider pushing to testing first!") + "stable, which is strongly discouraged. Please " + "consider pushing to testing first!") elif update.request == 'stable' and update.release.locked: note.append("This update is bypassing updates-testing for a " "pending release, which is strongly discouraged. " commit dfdf1f57e82de781f6d604947b39dc609cb52571 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:17:11 2010 -0500 Strongly discourage devs from pushing directly to stable for pending releases diff --git a/bodhi/controllers.py b/bodhi/controllers.py index c3377b2..e7d9e7f 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -837,6 +837,11 @@ class Root(controllers.RootController): 'releng' not in identity.current.groups): note.append("You're pushing a critical path package directly to " "stable. Please consider pushing to testing first!") + elif update.request == 'stable' and update.release.locked: + note.append("This update is bypassing updates-testing for a " + "pending release, which is strongly discouraged. " + "Please ensure that it is properly tested, or " + "consider pushing it to testing first.") flash_log('. '.join(note)) commit f31e885836bdab3fbe806e0a8b5f10bf35056b4e Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:06:16 2010 -0500 Add a bunch of unit tests for the No Frozen Rawhide policy diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 2228c0a..916d297 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -21,9 +21,9 @@ from bodhi.exceptions import DuplicateEntryError cherrypy.root = Root() -def create_release(num='7', dist='dist-fc'): +def create_release(num='7', dist='dist-fc', **kw): rel = Release(name='F'+num, long_name='Fedora '+num, id_prefix='FEDORA', - dist_tag=dist+num) + dist_tag=dist+num, **kw) assert rel assert Release.byName('F'+num) return rel @@ -1243,3 +1243,223 @@ class TestControllers(testutil.DBTest): assert False, "Old obsolete build still exists!!" except SQLObjectNotFound: pass + + def test_push_critpath_to_release(self): + session = login() + create_release() + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) + self.save_update(params, session) + log = testutil.get_log() + assert "Update successfully created. You're pushing a critical path package directly to stable. Please consider pushing to testing first!" in log, log + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'stable' + + def test_push_critpath_to_frozen_release(self): + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_push_critpath_to_frozen_release_and_request_stable(self): + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + # Ensure we can't create a stable request + testutil.capture_log(["bodhi.util", "bodhi.controllers", "bodhi.model"]) + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='POST', headers=session) + log = testutil.get_log() + assert "Forcing critical path update into testing" in log + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_push_critpath_to_frozen_release_and_request_stable_as_releng(self): + session = login(group='releng') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': 'stable', + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'stable' + + def test_critpath_to_frozen_release_available_actions(self): + """ + Ensure devs can attempt to push critpath updates for pending releases + to stable, but make sure that it can only go to testing. + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push to Stable" not in cherrypy.response.body[0] + + testutil.create_request('/updates/request/stable/%s' % params['builds'], + method='POST', headers=session) + update = PackageUpdate.byTitle(params['builds']) + assert update.request == 'testing' + + def test_critpath_to_frozen_release_available_actions_for_releng(self): + """ + Ensure releng/qa can push critpath updates to stable for pending releases + """ + session = login(group='releng') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Push to Testing" in cherrypy.response.body[0] + assert "Push Critical Path update to Stable" in cherrypy.response.body[0] + + def test_critpath_to_frozen_release_testing(self): + """ + Ensure devs can *not* push critpath updates directly to stable + for pending releases + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + # Ensure the dev cannot push it to stable + assert "/updates/request/stable" not in cherrypy.response.body[0] + + def test_non_critpath_to_frozen_release_testing(self): + """ + Ensure non-critpath packages can still be pushed to stable as usual + """ + session = login() + create_release(locked=True) + params = { + 'builds' : 'nethack-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "/updates/request/stable" in cherrypy.response.body[0] + + def test_critpath_to_frozen_release_testing_admin_actions(self): + """ + Ensure admins can submit critpath updates for pending releases to stable. + """ + session = login(group='qa') + create_release(locked=True) + params = { + 'builds' : 'kernel-2.6.31-1.fc7', + 'release' : 'Fedora 7', + 'type_' : 'bugfix', + 'bugs' : '', + 'notes' : 'foobar', + 'stable_karma' : 1, + 'request': None, + 'unstable_karma' : -1, + } + self.save_update(params, session) + update = PackageUpdate.byTitle(params['builds']) + + # Pretend it's pushed to testing + update.pushed = True + update.status = 'testing' + + testutil.create_request('/updates/%s' % params['builds'], + method='GET', headers=session) + + assert "Mark Critical Path update as Stable" in cherrypy.response.body[0] commit 4008b9c7354b13c96d3e9be93bf09b285573fab6 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:59 2010 -0500 Tweak our update action links for the No Frozen Rawhide policy diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index ea01bef..8e7c8af 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -67,12 +67,24 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k Push to Testing </a> </td> + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Push Critical Path update to Stable + </a> + </td> + + <td> <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/submit.png')}" border="0"/> Push to Stable </a> </td> + + <td> <a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/trash.png')}" border="0"/> @@ -95,14 +107,26 @@ karma = "<img src=\"%s\" align=\"top\" /> %d" % (tg.url('/static/images/k </a> </td> - - <td> - <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> - <img src="${tg.url('/static/images/submit.png')}" border="0"/> - Mark as Stable - </a> - </td> - + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark Critical Path update as Stable + </a> + </td> + + + + <td> + <a href="${util.url('/request/stable/%s' % update.title)}" class="list"> + <img src="${tg.url('/static/images/submit.png')}" border="0"/> + Mark as Stable + </a> + </td> + + <td> <a href="${util.url('/edit/%s' % update.title)}" class="list"> <img src="${tg.url('/static/images/edit.png')}" border="0"/> commit 835598ced5d3ba0112d8dbdd684af9d4d7de775a Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:45 2010 -0500 Add a PackageUpdate.critpath property diff --git a/bodhi/model.py b/bodhi/model.py index 17c41e9..a05ca2d 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -825,6 +825,17 @@ class PackageUpdate(SQLObject): return None return int(self.updateid.split('-')[-1]) + @property + def critpath(self): + """ Return whether or not this update is in the critical path """ + critical = False + critpath_pkgs = config.get('critpath').split() + for build in self.builds: + if build.package.name in critpath_pkgs: + critical = True + break + return critical + class Comment(SQLObject): timestamp = DateTimeCol(default=datetime.utcnow) commit 547ea42ba8c32ae261ce4c1b2cb231e284aafab8 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:28 2010 -0500 [No Frozen Rawhide] Disable pushing critical path updates for pending releases directly to stable. diff --git a/bodhi/model.py b/bodhi/model.py index f55ff3b..17c41e9 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -407,6 +407,17 @@ class PackageUpdate(SQLObject): flash_log('%s does not have a request to revoke' % self.title) return + # [No Frozen Rawhide] Disable pushing critical path updates for + # pending releases directly to stable. + if action == 'stable' and self.release.locked and self.critpath: + if ('releng' in identity.current.groups or + 'qa' in identity.current.groups): + self.comment('Critical path update approved by %s' % + identity.current.user_name, author='bodhi') + else: + log.info('Forcing critical path update into testing') + action = 'testing' + self.request = action self.pushed = False #self.date_pushed = None commit 41c407e5a73dfcaa9077eb2babd8301911d10a78 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:17 2010 -0500 [No Frozen Rawhide] We're going to re-use this column to flag 'pending' releases, since we'll no longer need to lock releases in this case. diff --git a/bodhi/model.py b/bodhi/model.py index 819b571..f55ff3b 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -50,9 +50,12 @@ class Release(SQLObject): updates = MultipleJoin('PackageUpdate', joinColumn='release_id') id_prefix = UnicodeCol(notNone=True) dist_tag = UnicodeCol(notNone=True) # ie dist-fc7 - locked = BoolCol(default=False) metrics = PickleCol(default=None) # {metric: {data}} + # [No Frozen Rawhide] We're going to re-use this column to flag 'pending' + # releases, since we'll no longer need to lock releases in this case. + locked = BoolCol(default=False) + def get_version(self): regex = re.compile('\D+(\d+)$') return int(regex.match(self.name).groups()[0]) commit 63b8f7dc67e08da4c539a0a2bf36e3ae2526bf5b Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:05:04 2010 -0500 [No Frozen Rawhide] Move stable builds going to a locked release to the dist-tag diff --git a/bodhi/masher.py b/bodhi/masher.py index 6464d73..1293e75 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -385,6 +385,10 @@ class MashTask(Thread): for update in self.updates: if update.request == 'stable': self.tag = update.release.stable_tag + # [No Frozen Rawhide] Move stable builds going to a locked + # release to the dist-tag + if update.release.locked and update.critpath: + self.tag = update.release.dist_tag elif update.request == 'testing': self.tag = update.release.testing_tag elif update.request == 'obsolete': commit 5fd95a684f0a7dd8a271b7a7df198356bf804069 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:55 2010 -0500 [No Frozen Rawhide] Don't mash stable repos for pending releases diff --git a/bodhi/masher.py b/bodhi/masher.py index c890d92..6464d73 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -351,6 +351,11 @@ class MashTask(Thread): """ for update in self.updates: release = update.release + + # [No Frozen Rawhide] Don't mash stable repos for pending releases + if update.request == 'stable' and release.locked: + continue + if self.resume: self.repos.add(release.stable_repo) self.repos.add(release.testing_repo) commit 54b18e535a19a5cf9b11d0a2dd49ffd0cc934a09 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:44 2010 -0500 Politely discourage devs from pushing critpath straight to stable diff --git a/bodhi/controllers.py b/bodhi/controllers.py index fa2e7e1..c3377b2 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -831,6 +831,13 @@ class Root(controllers.RootController): flash_log(str(e)) raise InvalidUpdateException(params) + # Politely discourage devs from pushing critpath straight to stable + if (update.request == 'stable' and update.critpath and + 'qa' not in identity.current.groups and + 'releng' not in identity.current.groups): + note.append("You're pushing a critical path package directly to " + "stable. Please consider pushing to testing first!") + flash_log('. '.join(note)) if request_format() == 'json': commit 1e486d8d35495d46523e1f1ec805ecbad0b57764 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:28 2010 -0500 Hardcode the critpath package list until we can query the pkgdb for it diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg index 0cf1843..2c94f87 100644 --- a/bodhi/config/app.cfg +++ b/bodhi/config/app.cfg @@ -148,6 +148,14 @@ tgcaptcha.jpeg_generator = 'mcdermott' tgcaptcha.key = 'Y`h`f&s}TZz' #tgcaptcha.controller = '/updates/captcha' +## +## Critical Path Packages +## +## Hardcoded, until we can query the pkgdb for it. +## http://kojipkgs.fedoraproject.org/mash/rawhide-20100107/logs/critpath.txt +critpath = "ConsoleKit ConsoleKit-libs ConsoleKit-x11 DeviceKit-power GConf2 GConf2-gtk MAKEDEV ModemManager NetworkManager NetworkManager-glib ORBit2 acl alsa-lib anaconda anaconda-yum-plugins at-spi atk attr audit audit-libs authconfig authconfig-gtk avahi avahi-autoipd avahi-glib basesystem bash binutils bluecurve-cursor-theme bzip2 bzip2-libs c-ares ca-certificates cairo checkpolicy chkconfig cloog-ppl compat-db47 comps-extras constantine-backgrounds constantine-backgrounds-single control-center control-center-filesystem coreutils coreutils-libs cpio cpp cracklib cracklib-dicts cracklib-python createrepo cronie cronie-anacron crontabs cryptsetup-luks cryptsetup-luks-libs cups-libs curl cyrus-sasl cyrus-sasl-lib dash db4 db4-utils dbus dbus-glib dbus-libs dbus-python dbus-x11 deltarpm desktop-backgrounds-basic desktop-file-utils device-mapper device-mapper-event device-mapper-event-libs device-mapper-libs dhclient diffutils dmidecode dmraid dmraid-events dnsmasq dosfstools dracut e2fsprogs e2fsprogs-libs efibootmgr eggdbus elfutils elfutils-libelf elfutils-libs ethtool evolution-data-server expat fedora-gnome-theme fedora-icon-theme fedora-logos fedora-release fedora-setup-keyboard file file-libs filesystem findutils fipscheck fipscheck-lib firstboot flac fontconfig freetype gamin gawk gcc gcc-c++ gdbm gdm genisoimage glib2 glibc glibc-common glibc-devel glibc-headers gmp gnome-desktop gnome-icon-theme gnome-keyring gnome-keyring-pam gnome-menus gnome-panel-libs gnome-python2 gnome-python2-canvas gnome-python2-gnome gnome-python2-gnomevfs gnome-session gnome-settings-daemon gnome-themes gnome-vfs2 gnupg2 gnutls gpgme grep grub grubby gstreamer gstreamer-tools gtk2 gtk2-engines gzip hal hal-info hal-libs hdparm hesiod hicolor-icon-theme hostname hwdata info initscripts iptables iptables-ipv6 iputils iscsi-initiator-utils iso-codes isomd5sum jasper-libs kbd kernel kernel-headers keyutils-libs koji kpartx krb5-libs less libICE libIDL libSM libX11 libX11-common libXScrnSaver libXau libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXfont libXft libXi libXinerama libXmu libXrandr libXrender libXres libXt libXtst libXv libXvMC libXxf86misc libXxf86vm libacl libart_lgpl libasyncns libattr libblkid libbonobo libbonoboui libcanberra libcanberra-gtk2 libcap libcap-ng libcom_err libcroco libcurl libdaemon libdrm libedit libffi libfontenc libgail-gnome libgcc libgcrypt libglade2 libgnome libgnomecanvas libgnomekbd libgnomeui libgomp libgpg-error libgsf libgudev1 libgweather libical libidn libjpeg libmcpp libnl libnotify libogg libpcap libpciaccess libpng libproxy libproxy-bin libproxy-python librsvg2 libselinux libselinux-python libselinux-utils libsemanage libsepol libsndfile libsoup libss libssh2 libstdc++ libstdc++-devel libtasn1 libtdb libthai libtiff libtool-ltdl libudev libusb libuser libuser-python libutempter libuuid libvorbis libwnck libx86 libxcb libxkbfile libxklavier libxml2 libxml2-python libxslt linux-firmware livecd-tools logrotate lua lvm2 lvm2-libs lzma lzma-libs m4 makebootfat mash mcpp mdadm metacity mingetty mobile-broadband-provider-info module-init-tools mpfr mtools mysql-libs nash ncurses ncurses-base ncurses-libs net-tools newt newt-python notification-daemon notification-daemon-engine-slider nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-util ntp ntpdate openldap openssh openssh-clients openssh-server openssl pam pango parted passwd patch pciutils-libs pcre perl perl-Crypt-PasswdMD5 perl-Digest-SHA1 perl-Module-Pluggable perl-Pod-Escapes perl-Pod-Simple perl-libs perl-version pinentry pixman pkgconfig plymouth plymouth-gdm-hooks plymouth-libs plymouth-scripts plymouth-utils pm-utils policycoreutils polkit polkit-desktop-policy polkit-gnome popt postfix ppl ppp procmail procps psmisc pth pulseaudio-gdm-hooks pulseaudio-libs pulseaudio-libs-glib2 pungi pyOpenSSL pycairo pygobject2 pygpgme pygtk2 pygtk2-libglade pykickstart pyparted python python-bugzilla python-cryptsetup python-decorator python-deltarpm python-ethtool python-imgcreate python-iniparse python-kid python-krbV python-libs python-meh python-nss python-pyblock python-pycurl python-slip python-urlgrabber pyxf86config radeontool rarian rarian-compat readline redhat-menus redhat-rpm-config repoview rootfiles rpm rpm-build rpm-libs rpm-python rsyslog sed selinux-policy selinux-policy-targeted sendmail setserial setup setuptool sgml-common sgpio shadow-utils shared-mime-info slang sound-theme-freedesktop sqlite squashfs-tools startup-notification sudo sysklogd syslinux system-config-date system-config-firewall-base system-config-keyboard system-config-users sysvinit-tools tar tcp_wrappers-libs tzdata udev unique unzip upstart usermode usermode-gtk ustr util-linux-ng vbetool vim-minimal which wpa_supplicant xcb-util xdg-utils xkeyboard-config xml-common xorg-x11-drivers xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-drv-ast xorg-x11-drv-ati xorg-x11-drv-cirrus xorg-x11-drv-dummy xorg-x11-drv-elographics xorg-x11-drv-evdev xorg-x11-drv-fbdev xorg-x11-drv-fpit xorg-x11-drv-geode xorg-x11-drv-glint xorg-x11-drv-hyperpen xorg-x11-drv-i128 xorg-x11-drv-i740 xorg-x11-drv-intel xorg-x11-drv-keyboard xorg-x11-drv-mach64 xorg-x11-drv-mga xorg-x11-drv-mouse xorg-x11-drv-mutouch xorg-x11-drv-neomagic xorg-x11-drv-nouveau xorg-x11-drv-nv xorg-x11-drv-openchrome xorg-x11-drv-penmount xorg-x11-drv-r128 xorg-x11-drv-rendition xorg-x11-drv-s3virge xorg-x11-drv-savage xorg-x11-drv-siliconmotion xorg-x11-drv-sis xorg-x11-drv-sisusb xorg-x11-drv-synaptics xorg-x11-drv-tdfx xorg-x11-drv-trident xorg-x11-drv-v4l xorg-x11-drv-vesa xorg-x11-drv-vmmouse xorg-x11-drv-vmware xorg-x11-drv-void xorg-x11-drv-voodoo xorg-x11-drv-wacom xorg-x11-server-Xorg xorg-x11-server-common xorg-x11-server-utils xorg-x11-xauth xorg-x11-xinit xorg-x11-xkb-utils xz xz-libs yum yum-metadata-parser yum-utils zenity zlib" + + # The commented out values below are the defaults # VIEW commit dbb609c91b1f35cf07eaebd22aa795596c2b95e0 Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 7 12:04:12 2010 -0500 Don't hide locked releases anymore diff --git a/bodhi/admin.py b/bodhi/admin.py index db096dd..7d80d25 100644 --- a/bodhi/admin.py +++ b/bodhi/admin.py @@ -110,9 +110,14 @@ class AdminController(Controller, SecureResource): else: # Get a list of all updates with a request that aren't # unapproved security updates, or for a locked release - requests = filter(lambda update: not update.release.locked, - PackageUpdate.select( - PackageUpdate.q.request != None)) + requests = PackageUpdate.select(PackageUpdate.q.request != None) + + # Come F13+, bodhi will not have locked releases. It will + # implement the 'No Frozen Rawhide' proposal, and treat 'locked' + # releases as pending. + #requests = filter(lambda update: not update.release.locked, + # PackageUpdate.select( + # PackageUpdate.q.request != None)) for update in requests: if update.type == 'security' and not update.approved: continue

1 0

6 commits - bodhi/controllers.py bodhi/metadata.py bodhi/templates bodhi/tests
by Luke Macken 04 Jan '10

04 Jan '10

bodhi/controllers.py | 5 ++++- bodhi/metadata.py | 9 +++++++-- bodhi/templates/master.kid | 4 ++-- bodhi/tests/test_controllers.py | 5 ++++- bodhi/tests/test_model.py | 12 ++++++------ 5 files changed, 23 insertions(+), 12 deletions(-) New commits: commit 8f1d71ffad864b6de0328ba5d1921817aae93c02 Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Wed Oct 14 23:09:47 2009 +0200 Ticket #353: "enable karma automatism" always gets reenabled Makes the tests work with new behavior of the autokarma checkbox. diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 8dc9b2f..2228c0a 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -97,7 +97,8 @@ class TestControllers(testutil.DBTest): 'type_' : 'enhancement', 'bugs' : '1234', 'cves' : 'CVE-2020-0001', - 'notes' : 'foobar' + 'notes' : 'foobar', + 'autokarma' : True } self.save_update(params, session) assert "This resource resides temporarily at <a href='http://localhost/updates/TurboGears-1.0.2.2-2.fc7'>http://localhost/updates/TurboGears-1.0.2.2-2.fc7</a>" in cherrypy.response.body[0], cherrypy.response.body[0] @@ -901,6 +902,7 @@ class TestControllers(testutil.DBTest): 'bugs' : '', 'notes' : 'foobar', 'request' : 'Stable', + 'autokarma' : True, 'stable_karma' : 5, 'unstable_karma' : -5 } @@ -917,6 +919,7 @@ class TestControllers(testutil.DBTest): 'bugs' : '', 'notes' : 'foobar', 'request' : 'Stable', + 'autokarma' : True, 'stable_karma' : 1, 'unstable_karma' : -1, } commit c6f359720e3c1360e309177f7328237e291818f1 Author: Mathieu Bridon (bochecha) <bochecha(a)fedoraproject.org> Date: Wed Oct 14 22:29:21 2009 +0200 Ticket #353: "enable karma automatism" always gets reenabled Take into account whether the package maintainer checked or unchecked the autokarma checkbox. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 35bf9de..fa2e7e1 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -471,7 +471,7 @@ class Root(controllers.RootController): @identity.require(identity.not_anonymous()) def save(self, builds, type_, notes, bugs, close_bugs=False, edited=False, request='testing', suggest_reboot=False, inheritance=False, - autokarma=True, stable_karma=3, unstable_karma=-3, **kw): + autokarma=False, stable_karma=3, unstable_karma=-3, **kw): """ Save an update. This entails either creating a new update, or editing an existing one. commit f9409d0309dbd3d6c141f889571ea784a7e7a411 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 4 15:55:20 2010 -0500 Update our test suite for the new year :( diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py index de20041..f2c802f 100644 --- a/bodhi/tests/test_model.py +++ b/bodhi/tests/test_model.py @@ -127,14 +127,14 @@ class TestPackageUpdate(testutil.DBTest): time.localtime()[0]) # 10k bug - update.updateid = 'FEDORA-2009-9999' + update.updateid = 'FEDORA-2010-9999' newupdate = self.get_update(name='nethack-2.5.6-1.fc10') newupdate.assign_id() - assert newupdate.updateid == 'FEDORA-2009-10000' + assert newupdate.updateid == 'FEDORA-2010-10000' newerupdate = self.get_update(name='nethack-2.5.7-1.fc10') newerupdate.assign_id() - assert newerupdate.updateid == 'FEDORA-2009-10001' + assert newerupdate.updateid == 'FEDORA-2010-10001' # test updates that were pushed at the same time. assign_id should # be able to figure out which one has the highest id. @@ -144,7 +144,7 @@ class TestPackageUpdate(testutil.DBTest): newest = self.get_update(name='nethack-2.5.8-1.fc10') newest.assign_id() - assert newest.updateid == 'FEDORA-2009-10002' + assert newest.updateid == 'FEDORA-2010-10002' def test_epel_id(self): """ Make sure we can handle id_prefixes that contain dashes. eg: FEDORA-EPEL """ @@ -288,7 +288,7 @@ class TestPackageUpdate(testutil.DBTest): templates = get_template(update) assert templates assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7' - assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2009-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…', templates[0][1] + assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…', templates[0][1] def test_latest(self): update = self.get_update(name='yum-3.2.1-1.fc7') @@ -548,7 +548,7 @@ class TestPackageUpdate(testutil.DBTest): templates = get_template(update) assert templates assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7' - assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2009-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…' + assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n----------… update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttp://fedoraproject.org/keys\n----------------------------------------…' class TestBugzilla(testutil.DBTest): commit 75fc20a0d922dcf613f26cb2c2f811e3562fa1e9 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 4 15:55:03 2010 -0500 Add a big TODO, which will hopefully fix the problem with our auto-obsoletion diff --git a/bodhi/controllers.py b/bodhi/controllers.py index fc8e07d..35bf9de 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -731,6 +731,9 @@ class Root(controllers.RootController): # (edited and oldBuild in edited.builds): # obsoletable = False # break +# TODO: +# ensure that all of the packages in the old update are present in the new one +# compare length of builds, and match them. # if rpm.labelCompare(util.get_nvr(oldBuild.nvr), nvr) < 0: # log.debug("%s is obsoletable" % oldBuild.nvr) # obsoletable = True commit 0cbac3c8a832ee9dd3dd108018885e7878317ee2 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 4 15:47:26 2010 -0500 Don't remove security update metadata from our updateinfo (#259). Eventually, we should add the metadata for the latest versions of all packages. This way, if a newer version (say, enhancement) comes out after the security update, the user can be made aware that they are still vulnerable if they have not updated to at least the security fix version diff --git a/bodhi/metadata.py b/bodhi/metadata.py index e9bbab6..3f73e92 100644 --- a/bodhi/metadata.py +++ b/bodhi/metadata.py @@ -24,7 +24,7 @@ from sqlobject import SQLObjectNotFound from turbogears import config from bodhi.util import get_repo_tag -from bodhi.model import PackageBuild +from bodhi.model import PackageBuild, PackageUpdate from bodhi.buildsys import get_session from bodhi.modifyrepo import RepoMetadata from bodhi.exceptions import RepositoryNotFound @@ -65,7 +65,7 @@ class ExtendedMetadata: # Add all relevant notices from the metadata to this document ids = [update.updateid for update in self.updates if update.updateid] for notice in umd.get_notices(): - if notice['update_id'] in ids: + if notice['update_id'] in ids or notice['type'] == 'security': self._add_notice(notice) else: log.debug("Removing %s from updateinfo" % notice['title']) @@ -77,6 +77,11 @@ class ExtendedMetadata: else: missing_ids.append(update.title) + # Add *all* security updates + # TODO: only the most recent + #for update in PackageUpdate.select(PackageUpdate.q.type=='security'): + # self.add_update(update) + if missing_ids: log.error("%d updates with missing ID!" % len(missing_ids)) log.debug(missing_ids) commit 4e13c4494157d76ee0c2386fdbba1dee4166cf78 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 4 15:46:44 2010 -0500 Move the Login/Logout button to the top of the menu (per many requests) diff --git a/bodhi/templates/master.kid b/bodhi/templates/master.kid index 3e0cb24..61f67d2 100644 --- a/bodhi/templates/master.kid +++ b/bodhi/templates/master.kid @@ -84,6 +84,8 @@ $(document).ready(function() { </ul> </div> <ul id="fedora-side-nav"> + <li py:if="not tg.identity.anonymous"><a href="${tg.url('/logout')}">Logout</a></li> + <li py:if="tg.identity.anonymous"><a href="${tg.url('/login')}">Login</a></li> <li><a href="${tg.url('/')}">${tg.identity.anonymous and ' ' or "%s's " % tg.identity.user_name}Home</a></li> <li py:if="not tg.identity.anonymous"><a href="${tg.url('/mine')}">My Updates (${PackageUpdate.select(PackageUpdate.q.submitter == tg.identity.user_name).count()})</a></li> <li py:if="not tg.identity.anonymous"><a href="${tg.url('/new/')}">New Update</a></li> @@ -105,8 +107,6 @@ $(document).ready(function() { </li> <li class="release"><a href="${tg.url('/comments')}" class="link">Comments</a><a href="${tg.url('/rss/rss2.0?comments=True')}" class="rsslink"><img src="${tg.url('/static/images/rss.png')}" /></a> </li> - <li py:if="not tg.identity.anonymous"><a href="${tg.url('/logout')}">Logout</a></li> - <li py:if="tg.identity.anonymous"><a href="${tg.url('/login')}">Login</a></li> </ul> </div>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

bodhi January 2010