Makefile | 2 +- bodhi/config/app.cfg | 3 +++ bodhi/model.py | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 31709f388e9bfe8658075cb0ab63461afbfd53e6 Author: Luke Macken lmacken@redhat.com Date: Wed Jun 30 20:06:03 2010 -0400
Only touch bugs associated with a list of known products (#361)
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg index 9813a99..87e4c6f 100644 --- a/bodhi/config/app.cfg +++ b/bodhi/config/app.cfg @@ -131,6 +131,9 @@ pkgdb_url = 'https://admin.fedoraproject.org/pkgdb' bz_server = 'https://bugzilla.redhat.com/xmlrpc.cgi' bz_cookie = None
+# Bodhi will avoid touching bugs that are not against the following products +bz_products = 'Fedora,Fedora EPEL' + ## ## Packages that should suggest a reboot ## diff --git a/bodhi/model.py b/bodhi/model.py index 333f48b..c98570a 100644 --- a/bodhi/model.py +++ b/bodhi/model.py @@ -1043,6 +1043,9 @@ class Bugzilla(SQLObject): log.warning("No bodhi_email defined; skipping bug comment") return bz = Bugzilla.get_bz() + if bug.product not in config.get('bz_products', '').split(','): + log.warning("Skipping %r bug #%d" % (bug.product, self.bz_id)) + return if not comment: comment = self._default_message(update) log.debug("Adding comment to Bug #%d: %s" % (self.bz_id, comment)) @@ -1064,7 +1067,7 @@ class Bugzilla(SQLObject): log.debug("Setting Bug #%d to ON_QA" % self.bz_id) try: bug = bz.getbug(self.bz_id) - if bug.product != 'Fedora' and bug.product != 'Fedora EPEL': + if bug.product not in config.get('bz_products', '').split(','): log.warning("Skipping %r bug" % bug.product) return bug.setstatus('ON_QA', comment=comment) @@ -1083,7 +1086,7 @@ class Bugzilla(SQLObject): bz = Bugzilla.get_bz() try: bug = bz.getbug(self.bz_id) - if bug.product != 'Fedora' and bug.product != 'Fedora EPEL': + if bug.product not in config.get('bz_products', '').split(','): log.warning("Not closing %r bug" % bug.product) return bug.close('ERRATA', fixedin=update.builds[0].nvr)
commit 4592a8f460647e13f7ea89e161b6f2b6174a9708 Author: Till Maas opensource@till.name Date: Tue Dec 16 12:50:45 2008 +0100
- enforce LANG=C for nostests
diff --git a/Makefile b/Makefile index 0e5e12e..202b5f2 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ docs: `find bodhi -name '*.py'`
test: - nosetests + LANG=C nosetests
todo: grep -r --color=auto TODO bodhi/ || :