bodhi.egg-info/entry_points.txt bodhi.spec
by Luke Macken
bodhi.egg-info/entry_points.txt | 1 -
bodhi.spec | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 36b912a08131c0398fa4399ed9d9ac6032f44c6e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 29 19:42:24 2008 -0400
Fix some more client egg issues
diff --git a/bodhi.egg-info/entry_points.txt b/bodhi.egg-info/entry_points.txt
index 0de6f42..be5abad 100644
--- a/bodhi.egg-info/entry_points.txt
+++ b/bodhi.egg-info/entry_points.txt
@@ -1,7 +1,6 @@
[console_scripts]
bodhi-rmrelease = bodhi.tools.rmrelease:main
start-bodhi = bodhi.commands:start
-bodhi = bodhi.tools.client:main
bodhi-devinit = bodhi.tools.dev_init:main
bodhi-tagcheck = bodhi.tools.tagcheck:main
bodhi-init = bodhi.tools.init:main
diff --git a/bodhi.spec b/bodhi.spec
index a046702..0cedc7d 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -30,7 +30,7 @@ A modular piece of the Fedora Infrastructure stack
%package client
Summary: Bodhi Client
Group: Applications/Internet
-Requires: python-simplejson python-fedora koji yum python-setuptools
+Requires: python-simplejson python-fedora koji yum
%description client
Client tools for interacting with bodhi
@@ -109,7 +109,7 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
* Fri Aug 29 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-3
-- Require python-setuptools in our client
+- Fix some setuptools issues with our client subpackage
* Mon Aug 25 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-2
- Include the egg-info in the client subpackage.
15 years, 7 months
bodhi.spec setup.py
by Luke Macken
bodhi.spec | 8 ++------
setup.py | 1 -
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 0d299dc23d9d86eb444bfa0e6d84aa107a08f3d0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 29 19:40:41 2008 -0400
Fix our bodhi-client subpackage -- remove egg info and other crud
diff --git a/bodhi.spec b/bodhi.spec
index 7d77511..a046702 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -82,6 +82,8 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%{__install} -m 640 %{name}/config/*mash* %{buildroot}%{_sysconfdir}/%{name}/
%{__install} apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi
+%{__install} %{name}/tools/client.py %{buildroot}%{_bindir}/%{name}
+
%clean
%{__rm} -rf %{buildroot}
@@ -98,17 +100,11 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/*
%attr(-,apache,root) %{_localstatedir}/log/bodhi
%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
-%{python_sitelib}/%{name}/__init__.py*
%files client
-%doc COPYING README
%{_bindir}/bodhi
%{_mandir}/man1/bodhi.1.gz
-%{python_sitelib}/%{name}/tools
-%{python_sitelib}/%{name}/__init__.py*
-%{python_sitelib}/%{name}/release.py*
-%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%changelog
diff --git a/setup.py b/setup.py
index c90e2be..03cb807 100644
--- a/setup.py
+++ b/setup.py
@@ -168,7 +168,6 @@ setup(
entry_points = {
'console_scripts': (
'start-bodhi = bodhi.commands:start',
- 'bodhi = bodhi.tools.client:main',
'bodhi-pickledb = bodhi.tools.pickledb:main',
'bodhi-tagcheck = bodhi.tools.tagcheck:main',
'bodhi-init = bodhi.tools.init:main',
15 years, 7 months
2 commits - bodhi/masher.py bodhi.spec
by Luke Macken
bodhi.spec | 7 +++++--
bodhi/masher.py | 13 ++++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 269f371b0ac6de265616dcd3b1e96f1a53d5d9dc
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 29 19:24:47 2008 -0400
Our client requires python-setuptools
diff --git a/bodhi.spec b/bodhi.spec
index b673640..7d77511 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -30,7 +30,7 @@ A modular piece of the Fedora Infrastructure stack
%package client
Summary: Bodhi Client
Group: Applications/Internet
-Requires: python-simplejson python-fedora koji yum
+Requires: python-simplejson python-fedora koji yum python-setuptools
%description client
Client tools for interacting with bodhi
@@ -112,6 +112,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Fri Aug 29 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-3
+- Require python-setuptools in our client
+
* Mon Aug 25 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-2
- Include the egg-info in the client subpackage.
commit 6f47b1e34b61b2d80e910e2ccfc1b897731698ba
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 29 02:40:55 2008 -0400
Add a hack for our new key
diff --git a/bodhi/masher.py b/bodhi/masher.py
index 8c85a0c..2a39879 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -404,10 +404,17 @@ class MashTask(Thread):
for repo, mashdir in self.mashed_repos.items():
link = join(mashed_dir, repo)
newrepo = join(mashdir, repo)
+ arches = os.listdir(newrepo)
+
+ # HACK.
+ log.debug("Moving each arch to arch.newkey")
+ for arch in arches:
+ shutil.move(arch, '%s.newkey')
+ arches = os.listdir(newrepo)
+
log.debug("Running sanity checks on %s" % newrepo)
# make sure the new repository has our arches
- arches = os.listdir(newrepo)
for arch in config.get('arches').split():
if arch not in arches:
self.error_log("Cannot find arch %s in %s" % (arch, newrepo))
@@ -421,9 +428,9 @@ class MashTask(Thread):
return
# make sure that mash didn't symlink our packages
- for pkg in os.listdir(join(newrepo, 'i386')):
+ for pkg in os.listdir(join(newrepo, arches[0])):
if pkg.endswith('.rpm'):
- if islink(join(newrepo, 'i386', pkg)):
+ if islink(join(newrepo, arches[0], pkg)):
self.error_log("Mashed repository full of symlinks!")
return
break
15 years, 7 months
bodhi/templates
by Luke Macken
bodhi/templates/new.kid | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f923ee8a8694bde6232fc15d7b767969a6da8aa1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Aug 28 17:31:29 2008 -0400
Fix the 'Close bugs' checkbox alignment
diff --git a/bodhi/templates/new.kid b/bodhi/templates/new.kid
index d286591..a6cd3a9 100644
--- a/bodhi/templates/new.kid
+++ b/bodhi/templates/new.kid
@@ -82,7 +82,7 @@
py:content="error_for(field)" />
</font>
<span py:replace="field.display(value_for(field), **params_for(field))"/>
- <span py:if="i == 3">
+ <span py:if="i == 4">
<label for="form_close_bugs">${display_field_for('close_bugs')} Close bugs when update is stable</label>
</span>
<span py:if="field.help_text"
15 years, 7 months
3 commits - bodhi/tools
by Luke Macken
bodhi/tools/client.py | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 061b8b4fc3f2cfd5aca10a35d932083ef9f34e52
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Aug 27 23:21:51 2008 -0400
Show how many updates we've returned
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index efd26bb..b8ef32e 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -256,11 +256,11 @@ def main():
if data['num_items'] > 1:
for update in data['updates']:
log.info(bodhi.update_str(update, minimal=True))
+ log.info("%d updates found (%d shown)" % (
+ data['num_items'], len(data['updates'])))
else:
for update in data['updates']:
log.info(bodhi.update_str(update))
- log.info("%d updates found (%d shown)" % (
- data['num_items'], len(data['updates'])))
if args:
for arg in args:
data = bodhi.query(package=arg, release=opts.release,
commit 5e9eb4a2de6453a8911912367bc478bcac601dfb
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Aug 27 23:18:20 2008 -0400
Add a '--download' flag to our client
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index aaecb33..efd26bb 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -18,6 +18,7 @@
import sys
import logging
import urllib2
+import subprocess
from getpass import getpass, getuser
from optparse import OptionParser
@@ -66,6 +67,8 @@ def get_parser():
parser.add_option("-R", "--request", action="store", dest="request",
metavar="STATE", help="Request that an action be "
"performed on an update [testing|stable|unpush|obsolete]")
+ parser.add_option("-D", "--download", action="store", dest="download",
+ metavar="UPDATE", help="Download an update")
## Details
parser.add_option("-s", "--status", action="store", type="string",
@@ -271,6 +274,28 @@ def main():
request=opts.request, mine=opts.mine,
limit=opts.limit)
print_query(data)
+ elif opts.download:
+ data = bodhi.query(release=opts.release, status=opts.status,
+ type_=opts.type_, bugs=opts.bugs,
+ request=opts.request, mine=opts.mine,
+ limit=opts.limit, package=opts.download)
+ if len(data['updates']) > 1:
+ log.info("%d possible updates were found" %
+ len(data['updates']))
+ for update in data['updates']:
+ log.info(bodhi.update_str(update, minimal=True))
+ else:
+ update = data['updates'][0]
+ log.info("Downloading %s..." % update['title'])
+ p = subprocess.Popen('uname -m', shell=True,
+ stdout=subprocess.PIPE)
+ arch = p.communicate()[0].strip()
+ for build in update['builds']:
+ subprocess.call('koji download-build --arch=%s '
+ '--arch=noarch%s %s' % (arch,
+ arch == 'i686' and ' --arch=i386'
+ or '', build['nvr']),
+ shell=True)
else:
parser.print_help()
break
commit ea616621141360df7d1839b3c72e1ec8fc80e73b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Aug 27 13:46:06 2008 -0400
Bump our client API to 0.5.1
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index cedb68b..aaecb33 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -25,7 +25,7 @@ from optparse import OptionParser
from fedora.client import AuthError, ServerError
from fedora.client.bodhi import BodhiClient
-__version__ = '0.5.0'
+__version__ = '0.5.1'
__description__ = 'Command line tool for interacting with Bodhi'
BODHI_URL = 'https://admin.fedoraproject.org/updates/'
15 years, 7 months
5 commits - bodhi/controllers.py bodhi/model.py bodhi.spec bodhi/templates bodhi/tools
by Luke Macken
bodhi.spec | 12 ++++++++++--
bodhi/controllers.py | 3 +--
bodhi/model.py | 3 ++-
bodhi/templates/show.kid | 11 ++++++++---
bodhi/tools/client.py | 2 +-
5 files changed, 22 insertions(+), 9 deletions(-)
New commits:
commit ec46f3f6bde03abfcadb4b9f8ac64586ede9acf1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Aug 27 10:54:56 2008 -0400
Make it possible to add comments without javascript (rh#460159)
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index 9ef9e10..d80d538 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -208,14 +208,19 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
<div py:if="not update.comments">
There are no comments on this update.
</div>
- <h3 id="addcomment"><a href="#" onclick="$('#addcomment').hide(); $('#commentform').show('slow'); return false;">Add a comment >></a></h3>
- <div id="commentform" style="display: none">
+ <h3 id="addcomment" style="display: none"><a href="#" onclick="$('#addcomment').hide(); $('#commentform').show('slow'); return false;">Add a comment >></a></h3>
+ <div id="commentform">
<h3>Add a comment</h3>
${comment_form.display(value=values)}
</div>
</blockquote>
</blockquote>
-
+<script type="text/javascript">
+ $(document).ready(function(){
+ $('#commentform').hide();
+ $('#addcomment').show();
+ });
+</script>
</body>
</html>
commit 30599d0485b5529f1c5d5d8fda70b430d7d62caa
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Aug 25 21:20:18 2008 -0400
Utilize our PackageUpdate.stable_karma property
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 93e5fe7..94b9a49 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -376,8 +376,7 @@ class Root(controllers.RootController):
'stable_karma' : update.builds[0].package.stable_karma,
'unstable_karma' : update.builds[0].package.unstable_karma,
'suggest_reboot' : update.builds[0].package.suggest_reboot,
- 'autokarma' : update.builds[0].package.stable_karma != 0 and
- update.builds[0].package.unstable_karma != 0,
+ 'autokarma' : update.stable_karma != 0 and update.unstable_karma != 0,
}
log.debug("values = %s" % values)
if update.status == 'testing':
commit f806d96a34bbe423b066c1374db6a23d1e76af16
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Aug 25 21:19:58 2008 -0400
Include the egg-info in the client subpackage.
diff --git a/bodhi.spec b/bodhi.spec
index 07b5761..b673640 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
Name: bodhi
Version: 0.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -93,20 +93,28 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%{python_sitelib}/%{name}/
%{_bindir}/start-%{name}
%{_bindir}/%{name}-*
-%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%{_sysconfdir}/httpd/conf.d/bodhi.conf
%attr(-,apache,root) %{_datadir}/%{name}
%attr(-,apache,root) %config(noreplace) %{_sysconfdir}/bodhi/*
%attr(-,apache,root) %{_localstatedir}/log/bodhi
+%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
+%{python_sitelib}/%{name}/__init__.py*
%files client
%doc COPYING README
%{_bindir}/bodhi
%{_mandir}/man1/bodhi.1.gz
+%{python_sitelib}/%{name}/tools
+%{python_sitelib}/%{name}/__init__.py*
+%{python_sitelib}/%{name}/release.py*
+%{python_sitelib}/%{name}-%{version}-py%{pyver}.egg-info/
%changelog
+* Mon Aug 25 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-2
+- Include the egg-info in the client subpackage.
+
* Fri Aug 22 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-1
- Latest upstream release
commit 322e4579e0ae1ae869c9bed52dea5bfb09ecb420
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Aug 25 11:27:51 2008 -0400
Don't attempt to untag pending updates...
diff --git a/bodhi/model.py b/bodhi/model.py
index b083b18..0e4dfbc 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -661,7 +661,8 @@ class PackageUpdate(SQLObject):
mash takes place.
"""
log.debug("Obsoleting %s" % self.title)
- self.untag()
+ if self.status != 'pending':
+ self.untag()
self.status = 'obsolete'
self.request = None
if newer:
commit 55c21bb0e65301d0dcb42382ce1ea10a07691fa2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Aug 23 18:44:21 2008 -0400
Fix the --latest comment in our client
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index 2cfef66..cedb68b 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -229,7 +229,7 @@ def main():
if data.has_key('update'):
log.info(data['update'])
elif opts.latest:
- data = bodhi.latest(package=opts.latest)
+ data = bodhi.latest_builds(package=opts.latest)
if 'tg_flash' in data:
if data['tg_flash']:
log.info(data['tg_flash'])
15 years, 7 months
2 commits - bodhi/controllers.py bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi/release.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/SOURCES.txt | 1 +
bodhi.spec | 7 +++++--
bodhi/controllers.py | 2 +-
bodhi/release.py | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit f292b39b158988b64e2dc727c560c00b6a5c6d58
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 16:52:20 2008 -0400
0.5.1
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 2b0e068..43fa814 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.0
+Version: 0.5.1
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 5c4176c..02c1fc9 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -140,6 +140,7 @@ bodhi/templates/pending.kid
bodhi/templates/pkg.kid
bodhi/templates/pkgs.kid
bodhi/templates/push.kid
+bodhi/templates/search.kid
bodhi/templates/searchform.kid
bodhi/templates/security.kid
bodhi/templates/show.kid
diff --git a/bodhi.spec b/bodhi.spec
index df78120..07b5761 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,8 +2,8 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: bodhi
-Version: 0.5.0
-Release: 9%{?dist}
+Version: 0.5.1
+Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -107,6 +107,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Fri Aug 22 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.1-1
+- Latest upstream release
+
* Sun Jul 06 2008 Luke Macken <lmacken(a)redhat.com> - 0.5.0-1
- Latest upstream release
diff --git a/bodhi/release.py b/bodhi/release.py
index f310932..9661c24 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.5.0'
+VERSION = '0.5.1'
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 e4624ced738569f7cc8eacd0a546d7372808e487
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 16:29:52 2008 -0400
Include OR
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index aaa5ccb..93e5fe7 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -22,7 +22,7 @@ import xmlrpclib
from koji import GenericError
from datetime import datetime
from sqlobject import SQLObjectNotFound
-from sqlobject.sqlbuilder import AND
+from sqlobject.sqlbuilder import AND, OR
from turbogears import (controllers, expose, validate, redirect, identity,
paginate, flash, error_handler, validators, config, url)
15 years, 8 months
3 commits - bodhi/controllers.py bodhi/model.py bodhi/templates
by Luke Macken
bodhi/controllers.py | 4 ++--
bodhi/model.py | 10 ++++++----
bodhi/templates/show.kid | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 57765282dbffc20ac2a29ac18b12a41ae7950530
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 16:23:27 2008 -0400
Preserve newlines and use a non-proportional font for comments (#211)
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index ad5c18f..9ef9e10 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/>
- <div py:replace="comment.text">Comment</div>
+ <pre><div py:replace="comment.text">Comment</div></pre>
</div>
</div>
<div py:if="not update.comments">
commit 2c3ff023d7a2d32089db25ac925802f4a8bd8b6d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 16:11:33 2008 -0400
Fix a bug in update path checking
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index cdbba58..aaa5ccb 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -581,9 +581,9 @@ class Root(controllers.RootController):
kojiBuild['version'],
kojiBuild['release'])
- # Check for broken update paths against all releases
+ # Check for broken update paths
log.info("Checking for broken update paths")
- for release in Release.select():
+ for release in buildinfo[build]['releases']:
tags = ['dist-rawhide', release.dist_tag,
release.dist_tag + '-updates']
for tag in tags:
commit 9454a3d659704e07f90f6bb53d703a817537a74f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 15:19:02 2008 -0400
Stop spamming committers with new comments, until we can differentiate between them and the actual "maintainers"
diff --git a/bodhi/model.py b/bodhi/model.py
index 6a8dc0a..b083b18 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -602,20 +602,22 @@ class PackageUpdate(SQLObject):
self.request = 'stable'
self.pushed = False
self.date_pushed = None
- mail.send(self.get_maintainers(), 'stablekarma', self)
+ mail.send(self.submitter, 'stablekarma', self)
mail.send_admin('stablekarma', self)
if self.status == 'testing' and self.unstable_karma != 0 and \
self.karma == self.unstable_karma:
log.info("Automatically unpushing %s" % self.title)
self.obsolete()
- mail.send(self.get_maintainers(), 'unstable', self)
+ mail.send(self.submitter, 'unstable', self)
Comment(text=text, karma=karma, update=self, author=author,
anonymous=anonymous)
# Send a notification to everyone that has commented on this update
people = set()
- for person in self.get_maintainers():
- people.add(person)
+ people.add(self.submitter)
+ # Until we can differentiate between maintainers and committers
+ #for person in self.get_maintainers():
+ # people.add(person)
for comment in self.comments:
if comment.anonymous or comment.author == 'bodhi':
continue
15 years, 8 months
bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit af9c8b99df0b606093f7db21554cb4a9f3cd0886
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 15:06:51 2008 -0400
Show all updates with an outstanding request in the 'pending' list (#191)
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 744f504..cdbba58 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -815,7 +815,8 @@ class Root(controllers.RootController):
template = 'bodhi.templates.pending'
order = PackageUpdate.q.date_submitted
status = args[0]
- query.append(PackageUpdate.q.status == status)
+ query.append(OR(PackageUpdate.q.status == status,
+ PackageUpdate.q.request != None))
elif args[0] == 'security':
query.append(PackageUpdate.q.type == 'security')
query.append(PackageUpdate.q.pushed == True)
15 years, 8 months
3 commits - bodhi/metrics.py bodhi/model.py bodhi/templates
by Luke Macken
bodhi/metrics.py | 3 ++-
bodhi/model.py | 6 ++++++
bodhi/templates/show.kid | 5 ++++-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit c34694ba4bcb3c52803ddfe0d92fcfdc8bc4fb4b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 14:28:35 2008 -0400
Don't close bugs filed against the 'Security Response' product (#197)
diff --git a/bodhi/model.py b/bodhi/model.py
index 39533c8..6a8dc0a 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -833,6 +833,9 @@ class Bugzilla(SQLObject):
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)))
@@ -842,6 +845,9 @@ class Bugzilla(SQLObject):
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")
+ return
bug.close('NEXTRELEASE', fixedin=ver)
except xmlrpclib.Fault, f:
log.error("Unable to close bug #%d: %s" % (self.bz_id, str(f)))
commit 7dfb538532bc31399a6c1f4ed4923abbd1a28842
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 13:47:31 2008 -0400
Fix a metrics bug that prevented it from working
diff --git a/bodhi/metrics.py b/bodhi/metrics.py
index 6d780b7..a715acd 100644
--- a/bodhi/metrics.py
+++ b/bodhi/metrics.py
@@ -428,6 +428,7 @@ class MetricData(Singleton):
if not rel.metrics:
log.warning("No metrics found for %s" % rel.name)
return
+ self.init_metrics(rel)
if not freshwidgets.has_key(rel.name):
freshwidgets[rel.name] = {}
for metric in self.metrics:
@@ -435,7 +436,7 @@ class MetricData(Singleton):
if widget:
freshwidgets[rel.name][metric.__class__.__name__] = widget
- self.widgets = freshwidgets
+ self.widgets = freshwidgets
self.age = datetime.utcnow()
return self.widgets[release]
commit c259617d3ab081119e864262734379b8ae0a10f6
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Aug 22 12:38:33 2008 -0400
Handle None bug titles in our update template
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index c6ef92a..ad5c18f 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -184,7 +184,10 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
<blockquote>
<div py:for="bug in update.bugs">
<?python
- title = escape(bug.title.encode('utf8', 'replace'))
+ if bug.title:
+ title = escape(bug.title.encode('utf8', 'replace'))
+ else:
+ title = 'Unable to fetch bug title'
cve = title.split()[0].replace(':', '')
if cve.startswith('CVE-'):
title = util.link(cve, 'http://cve.mitre.org/cgi-bin/cvename.cgi?name=' + cve) + ': ' + escape(' '.join(title.split()[1:]))
15 years, 8 months