January 2009 - bodhi - Fedora Mailing-Lists

by Luke Macken

bodhi/model.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) New commits: commit f17903aee51ae80b5d480f7f419ba927c073302a Author: Luke Macken <lmacken(a)redhat.com> Date: Thu Jan 22 15:01:02 2009 -0500 Only modify and close bugs under the 'Fedora' product. Also, only change bugs to ON_QA if the developer selected to 'Automatically close bugs'. This fixes infra#312 and bodhi#273. diff --git a/bodhi/model.py b/bodhi/model.py index 61f360d..3d7b48e 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -891,25 +891,28 @@ class Bugzilla(SQLObject): Change the status of this bug to ON_QA, and comment on the bug with some details on how to test and provide feedback for this update. """ - bz = Bugzilla.get_bz() - comment = self._default_message(update) - log.debug("Setting Bug #%d to ON_QA" % self.bz_id) - try: - bug = bz.getbug(self.bz_id) - if bug.product == 'Security Response': - log.warning("Skipping Security Response bug") - return - bug.setstatus('ON_QA', comment=comment) - except Exception, e: - log.error("Unable to alter bug #%d\n%s" % (self.bz_id, str(e))) + if update.close_bugs: + bz = Bugzilla.get_bz() + comment = self._default_message(update) + log.debug("Setting Bug #%d to ON_QA" % self.bz_id) + try: + bug = bz.getbug(self.bz_id) + if bug.product != 'Fedora': + log.warning("Skipping %r bug" % bug.product) + return + bug.setstatus('ON_QA', comment=comment) + except Exception, e: + log.error("Unable to alter bug #%d\n%s" % (self.bz_id, str(e))) + else: + log.debug('Skipping bug modification, close_bugs == False') 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) - if bug.product == 'Security Response': - log.warning("Not closing Security Response bug") + if bug.product != 'Fedora': + log.warning("Not closing %r bug" % bug.product) return bug.close('NEXTRELEASE', fixedin=ver) except xmlrpclib.Fault, f:

15 years, 2 months

1
0
0 / 0

bodhi/controllers.py

by Luke Macken

bodhi/controllers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b87b9728fef235812f28d5dcc8e2b68abcca3980 Author: Luke Macken <lmacken(a)redhat.com> Date: Wed Jan 7 15:42:15 2009 -0500 Order "My Updates" by date_submitted diff --git a/bodhi/controllers.py b/bodhi/controllers.py index ca07b3a..d2f30ac 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -304,7 +304,7 @@ class Root(controllers.RootController): """ List all updates submitted by the current user """ updates = PackageUpdate.select( PackageUpdate.q.submitter == identity.current.user_name, - orderBy=PackageUpdate.q.date_pushed).reversed() + orderBy=PackageUpdate.q.date_submitted).reversed() return dict(updates=request_format() == 'json' and map(unicode, updates) or updates, title='%s\'s updates' % identity.current.user_name, num_items=updates.count())

15 years, 3 months

1
0
0 / 0

bodhi/tests

by Luke Macken

bodhi/tests/test_controllers.py | 11 +++++------ bodhi/tests/test_model.py | 12 ++++++------ 2 files changed, 11 insertions(+), 12 deletions(-) New commits: commit d5b56c200831d16596addb95b7ab328b70d07325 Author: Luke Macken <lmacken(a)redhat.com> Date: Tue Jan 6 13:06:00 2009 -0500 Get all of our unit tests working diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index 8d1675f..2faad59 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1015,9 +1015,9 @@ class TestControllers(testutil.DBTest): # It should now appear in the queue config.update({'global': {'masher': None}}) - testutil.capture_log(['bodhi.controllers', 'bodhi.admin', 'bodhi.masher', 'bodhi.util']) + #testutil.capture_log(['bodhi.controllers', 'bodhi.admin', 'bodhi.masher', 'bodhi.util']) testutil.create_request('/updates/admin/push', headers=session) - testutil.print_log() + #testutil.print_log() assert '1 pending request' in cherrypy.response.body[0], cherrypy.response.body[0] # Revoke the stable request from the update @@ -1117,13 +1117,13 @@ class TestControllers(testutil.DBTest): 'notes' : '', 'edited' : u'kdelibs-4.1.0-5.fc9,kdegames-4.1.0-2.fc9,konq-plugins-4.1.0-2.fc9,qt-4.4.1-2.fc9,quarticurve-kwin-theme-0.0-0.5.beta4.fc9,kdepimlibs-4.1.0-2.fc9,kdebase-workspace-4.1.0-8.fc9,akonadi-1.0.0-2.fc9,kde-l10n-4.1.0-2.fc9,kdegraphics-4.1.0-3.fc9,kdeutils-4.1.0-1.fc9.1,kdebindings-4.1.0-5.fc9,kde-i18n-3.5.9-8.fc9,kdeartwork-4.1.0-1.fc9,kdemultimedia-4.1.0-1.fc9,kdetoys-4.1.0-1.fc9,kdebase-runtime-4.1.0-1.fc9,kdeadmin-4.1.0-2.fc9,kdenetwork-4.1.0-2.fc9,kdeaccessibility-4.1.0-1.fc9,kdeplasma-addons-4.1.0-1.fc9,kdeedu-4.1.0-1.fc9,kdebase-4.1.0-1.fc9.1,kdesdk-4.1.0-1.fc9,kde-filesystem-4-17.fc9,qscintilla-2.2-3.fc9,qgtkstyle-0.0-0.2.20080719svn693.fc9,compiz-0.7.6-3.fc9.1,soprano-2.1-1.fc9,PyQt4-4.4.2-2.fc9,sip-4.7.6-1.fc9,automoc-1.0-0.8.rc1.fc9,phonon-4.2.0-2.fc9', } - testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) + #testutil.capture_log(['bodhi.controllers', 'bodhi.util', 'bodhi.model']) self.save_update(params, session) update = PackageUpdate.byTitle(params['builds']) assert update.status == 'pending' assert PackageUpdate.select().count() == 1 assert PackageBuild.select().count() == len(params['builds'].split(',')) - testutil.print_log() + #testutil.print_log() def test_revoke_request(self): session = login() @@ -1134,7 +1134,7 @@ class TestControllers(testutil.DBTest): 'bugs' : '', 'notes' : '', } - testutil.capture_log(['bodhi.controllers', 'bodhi.util']) + #testutil.capture_log(['bodhi.controllers', 'bodhi.util']) self.save_update(params, session) update = PackageUpdate.byTitle(params['builds']) assert update.request == 'testing' @@ -1157,7 +1157,6 @@ class TestControllers(testutil.DBTest): 'unstable_karma': -3, 'type_': u'bugfix', 'close_bugs': True} - testutil.capture_log(['bodhi.controllers', 'bodhi.util']) self.save_update(params, session) update = PackageUpdate.byTitle(params['builds']) assert update diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py index 91ae71e..f48f02a 100644 --- a/bodhi/tests/test_model.py +++ b/bodhi/tests/test_model.py @@ -116,14 +116,14 @@ class TestPackageUpdate(testutil.DBTest): time.localtime()[0]) # 10k bug - update.updateid = 'FEDORA-2008-9999' + update.updateid = 'FEDORA-2009-9999' newupdate = self.get_update(name='nethack-2.5.6-1.fc10') newupdate.assign_id() - assert newupdate.updateid == 'FEDORA-2008-10000' + assert newupdate.updateid == 'FEDORA-2009-10000' newerupdate = self.get_update(name='nethack-2.5.7-1.fc10') newerupdate.assign_id() - assert newerupdate.updateid == 'FEDORA-2008-10001' + assert newerupdate.updateid == 'FEDORA-2009-10001' # test updates that were pushed at the same time. assign_id should # be able to figure out which one has the highest id. @@ -133,7 +133,7 @@ class TestPackageUpdate(testutil.DBTest): newest = self.get_update(name='nethack-2.5.8-1.fc10') newest.assign_id() - assert newest.updateid == 'FEDORA-2008-10002' + assert newest.updateid == 'FEDORA-2009-10002' def test_url(self): update = self.get_update() @@ -257,7 +257,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-2008-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-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] def test_latest(self): update = self.get_update(name='yum-3.2.1-1.fc7') @@ -517,7 +517,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-2008-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-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--------------------------------------...' class TestBugzilla(testutil.DBTest):

15 years, 3 months

1
0
0 / 0

bodhi/tests

by Luke Macken

bodhi/tests/test_controllers.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) New commits: commit 14766a8b8e18e5a857eab72a2b081faeb0e49369 Author: Toshio Kuratomi <a.badger(a)gmail.com> Date: Mon Jan 5 18:02:56 2009 -0800 bodhi test_user_notes_encoding fix Here's a patch to fix the user_notes_encoding() test to use unicode appropriately. diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py index aa3ff1d..8d1675f 100644 --- a/bodhi/tests/test_controllers.py +++ b/bodhi/tests/test_controllers.py @@ -1,4 +1,5 @@ # $Id: test_controllers.py,v 1.3 2006/12/31 09:10:25 lmacken Exp $ +# -*- coding: utf-8 -*- import os import turbogears @@ -169,14 +170,14 @@ class TestControllers(testutil.DBTest): 'type_' : 'bugfix', 'bugs' : '', 'cves' : '', - 'notes' : 'Foo\u2019bar' + 'notes' : u'Foo\u2019bar'.encode('utf-8') } self.save_update(params, session) update = PackageUpdate.byTitle(params['builds']) assert update.title == params['builds'] assert update.builds[0].nvr == params['builds'] assert update.release.long_name == params['release'] - assert update.notes == params['notes'] + assert update.notes == unicode(params['notes'], 'utf8') def test_bugs_update(self): session = login() @@ -1145,7 +1146,17 @@ class TestControllers(testutil.DBTest): def test_unicode_fail(self): session = login() create_release(num='8', dist='dist-f') - params = {'stable_karma': 3, 'builds': 'pidgin-libnotify-0.14-1.fc8', 'autokarma': True, 'inheritance': False, 'suggest_reboot': False, 'notes': u"Version 0.14 (2008-12-14):\r\n\r\n * really add option: don't show notifications when absent\r\n * Updated polish translation (Piotr Dr\u0105g)\r\n * Added russian translation (Dmitry Egorkin)\r\n * Added bulgarian translation (Dilyan Palauzov)\r\n * Added german translation (Marc Mikolits)\r\n * Added swedish translation (Jonas Granqvist)\r\n".encode('utf8'), 'request': u'Testing', 'bugs': '477267', 'unstable_karma': -3, 'type_': u'bugfix', 'close_bugs': True} + params = {'stable_karma': 3, + 'builds': 'pidgin-libnotify-0.14-1.fc8', + 'autokarma': True, + 'inheritance': False, + 'suggest_reboot': False, + 'notes': u"Version 0.14 (2008-12-14):\r\n\r\n * really add option: don't show notifications when absent\r\n * Updated polish translation (Piotr Dr\u0105g)\r\n * Added russian translation (Dmitry Egorkin)\r\n * Added bulgarian translation (Dilyan Palauzov)\r\n * Added german translation (Marc Mikolits)\r\n * Added swedish translation (Jonas Granqvist)\r\n".encode('utf8'), + 'request': u'Testing', + 'bugs': '477267', + 'unstable_karma': -3, + 'type_': u'bugfix', + 'close_bugs': True} testutil.capture_log(['bodhi.controllers', 'bodhi.util']) self.save_update(params, session) update = PackageUpdate.byTitle(params['builds'])

15 years, 3 months

1
0
0 / 0

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

by Luke Macken

bodhi.egg-info/PKG-INFO | 2 +- bodhi.spec | 5 ++++- bodhi/controllers.py | 1 + bodhi/release.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 816e6806db090a97ac3700861545ffedebf6cbc5 Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 5 18:50:05 2009 -0500 0.5.16 diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO index bdeded8..c3b551b 100644 --- a/bodhi.egg-info/PKG-INFO +++ b/bodhi.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: bodhi -Version: 0.5.15 +Version: 0.5.16 Summary: Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution Home-page: https://fedorahosted.org/bodhi Author: Luke Macken diff --git a/bodhi.spec b/bodhi.spec index 29f30f2..b554c21 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.5.15 +Version: 0.5.16 Release: 1%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet @@ -113,6 +113,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py %changelog +* Mon Jan 05 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.16-1 +- Latest upstream bugfix release. + * Mon Dec 22 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.15-1 - Latest release, with more masher improvements. diff --git a/bodhi/release.py b/bodhi/release.py index 63d196d..9d75bcc 100644 --- a/bodhi/release.py +++ b/bodhi/release.py @@ -1,4 +1,4 @@ -VERSION = '0.5.15' +VERSION = '0.5.16' 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 80894fee94de605ca663797bf92b73b271fc6dab Author: Luke Macken <lmacken(a)redhat.com> Date: Mon Jan 5 18:38:17 2009 -0500 Add a hack to fix ticket #288. We do this by ensuring that the type_, which can be one of ['security', 'bugfix', 'enhancement', 'newpackage'], is a standard utf8-encoded byte string. When this comes in as a unicode string, it somehow causes problem. I'm not sure how or why, but this hack "fixes" this issue. Adding unicode strings to the PackageUpdate's type EnumCol does not fix it. diff --git a/bodhi/controllers.py b/bodhi/controllers.py index 5edbaeb..ca07b3a 100644 --- a/bodhi/controllers.py +++ b/bodhi/controllers.py @@ -685,6 +685,7 @@ class Root(controllers.RootController): build.destroySelf() else: try: + type_ = type_.encode('utf8') # hack, for ticket #288 update = PackageUpdate(title=','.join(builds), release=release, submitter=identity.current.user_name,

15 years, 3 months

1
0
0 / 0

[PATCH] fix https://fedorahosted.org/bodhi/ticket/290

by Development discussions related to Fedora

Hi, I got cheesed off again by bodhi's display of comments, so I have had a go at adjusting code bits to make the comment text wrap, and still enforce applying CRLF when the commenter uses it. I haven't bothered with a local bodhi server instance, just inferred from a typical page how the template would need to change to generate html without <pre>, and instead a fixed-width style. I hope I was on the right track... DaveT. diff --git a/bodhi/static/css/layout.css b/bodhi/static/css/layout.css index eee822c..df4b738 100644 --- a/bodhi/static/css/layout.css +++ b/bodhi/static/css/layout.css @@ -449,6 +449,14 @@ div.flash { background: #ffb200; } +div.comment-text { + font-family: monospace; + white-space: pre-wrap; /* 2009-01-03: best effort for current browsers*/ + white-space: pre-line; /* css 2.1, enable later when moz 3.1+ available*/ +/*https://developer.mozilla.org/en/CSS/white-space*/ +/*http://www.w3.org/TR/CSS21/text.html#white-space-prop*/ +} + /* ** Login CSS (login.kid) */ diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid index d80d538..ca88573 100644 --- a/bodhi/templates/show.kid +++ b/bodhi/templates/show.kid @@ -202,7 +202,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k <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"/><b>${comment.anonymous and 'Anonymous Tester' or comment.author}</b> - ${comment.timestamp}<br/> - <pre><div py:replace="comment.text">Comment</div></pre> + <div class="comment-text" py:replace="comment.text">Comment</div> </div> </div> <div py:if="not update.comments">

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

bodhi January 2009