apache/bodhi.wsgi bodhi.cfg
by Toshio くらとみ
apache/bodhi.wsgi | 5 -----
bodhi.cfg | 1 +
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e4c4fac575c32832d81246bc8ff7a05ace81c7f2
Author: Toshio Kuratomi <toshio(a)fedoraproject.org>
Date: Tue Sep 22 15:55:32 2009 -0700
Move all config from wsgi script into config file.
diff --git a/apache/bodhi.wsgi b/apache/bodhi.wsgi
index 86e26f5..e2910dc 100644
--- a/apache/bodhi.wsgi
+++ b/apache/bodhi.wsgi
@@ -15,11 +15,6 @@ from fedora.tg.util import enable_csrf
from bodhi.util import load_config
load_config()
-turbogears.config.update({'global': {'server.environment': 'production'}})
-turbogears.config.update({'global': {'autoreload.on': False}})
-turbogears.config.update({'global': {'server.log_to_screen': False}})
-#turbogears.config.update({'global': {'server.webpath': None}})
-
if turbogears.config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
turbogears.startup.call_on_startup.append(enable_csrf)
diff --git a/bodhi.cfg b/bodhi.cfg
index 0e11d4a..049b422 100644
--- a/bodhi.cfg
+++ b/bodhi.cfg
@@ -30,6 +30,7 @@ server.log_file = "server.log"
server.log_to_screen = True
autoreload.package="bodhi"
+autoreload.on=False
tg.strict_parameters = True
#base_url_filter.on = True
#base_url_filter.use_x_forwarded_host = True
14 years, 7 months
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 | 7 +++++--
bodhi/controllers.py | 3 ++-
bodhi/release.py | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit b6684d0e7c7f4a37756d49f760ae0098530bea1a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Sep 18 08:30:16 2009 -0400
0.6.10
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index ad9bcfe..222b43d 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.9
+Version: 0.6.10
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 d3c8ba8..17b9208 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.6.9
-Release: 2%{?dist}
+Version: 0.6.10
+Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -115,6 +115,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Fri Sep 18 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.10-1
+- 0.6.10
+
* Thu Sep 17 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.9-2
- More CSRF tweaks
diff --git a/bodhi/release.py b/bodhi/release.py
index 680a19d..e643046 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.9'
+VERSION = '0.6.10'
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 988655b0f2ac968e244f53b0d2a565668ecc393b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Sep 18 08:29:28 2009 -0400
Don't add csrf tokens to bugzilla comments
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 034df01..fc8e07d 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -29,6 +29,7 @@ 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
@@ -816,7 +817,7 @@ class Root(controllers.RootController):
bug.add_comment(update,
"%s has been submitted as an update for %s.\n%s" %
(update.title, release.long_name,
- config.get('base_address') + url(update.get_url())))
+ config.get('base_address') + tg_url(update.get_url())))
# If a request is specified, make it. By default we're submitting
# new updates directly into testing
14 years, 7 months
bodhi/templates
by Luke Macken
bodhi/templates/master.kid | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4a447722d5b9a29aab4cf7234a9d06b522c0539e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Sep 17 10:43:05 2009 -0400
Link to our source code
diff --git a/bodhi/templates/master.kid b/bodhi/templates/master.kid
index c4fb84f..c245f74 100644
--- a/bodhi/templates/master.kid
+++ b/bodhi/templates/master.kid
@@ -138,7 +138,7 @@ $(document).ready(function() {
Copyright © 2007-2008 Red Hat, Inc. and others. All Rights Reserved.<br/>
Licensed under the GNU Public License v2 or later.<br />
The Fedora Project is maintained and driven by the community and sponsored by Red Hat.<br/>This is a community maintained site. Red Hat is not responsible for content.<br/>
- [ <a href="http://fedoraproject.org/wiki/Legal">Legal</a>, <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a> ]
+ [ <a href="http://fedoraproject.org/wiki/Legal">Legal</a>, <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a>, <a href="http://bodhi.fedorahosted.org">Source Code</a> ]
</div>
<!-- footer END -->
14 years, 7 months
2 commits - bodhi/controllers.py bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi/release.py bodhi.spec MANIFEST.in
by Luke Macken
MANIFEST.in | 1 +
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/SOURCES.txt | 2 ++
bodhi.spec | 10 ++++++++--
bodhi/controllers.py | 4 ++--
bodhi/release.py | 2 +-
6 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 7dceb68605905e5156ec554ea3187a8969843ee1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Sep 17 10:03:12 2009 -0400
More CSRF url tweaks
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 8e53add..ad9bcfe 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.8
+Version: 0.6.9
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 a8fa947..25a2421 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -136,8 +136,10 @@ bodhi/templates/comments.kid
bodhi/templates/confirmation.kid
bodhi/templates/form.kid
bodhi/templates/list.kid
+bodhi/templates/login.html
bodhi/templates/login.kid
bodhi/templates/masher.kid
+bodhi/templates/master.html
bodhi/templates/master.kid
bodhi/templates/metrics.kid
bodhi/templates/mine.kid
diff --git a/bodhi.spec b/bodhi.spec
index 57ed088..d3c8ba8 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.6.8
-Release: 1%{?dist}
+Version: 0.6.9
+Release: 2%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
License: GPLv2+
@@ -115,6 +115,12 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Thu Sep 17 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.9-2
+- More CSRF tweaks
+
+* Thu Sep 17 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.9-1
+- 0.6.9
+
* Mon Sep 14 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.8-1
- 0.6.8
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index a789fef..034df01 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -28,7 +28,7 @@ from sqlobject import SQLObjectNotFound
from sqlobject.sqlbuilder import AND, OR
from turbogears import (controllers, expose, validate, redirect, identity,
- paginate, flash, error_handler, validators, config, url)
+ paginate, flash, error_handler, validators, config)
from turbogears.widgets import DataGrid
from fedora.tg.util import request_format
@@ -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
+from bodhi.util import json_redirect, url
from bodhi.admin import AdminController
from bodhi.metrics import MetricsController
from bodhi.model import (Package, PackageBuild, PackageUpdate, Release,
diff --git a/bodhi/release.py b/bodhi/release.py
index c331e94..680a19d 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.8'
+VERSION = '0.6.9'
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 a1dd3eae16a31486232b3beda335a5d2429d07dc
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Sep 17 08:01:09 2009 -0400
include html templates
diff --git a/MANIFEST.in b/MANIFEST.in
index 44e8a61..d514ae3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include apache/bodhi.conf
include AUTHORS README COPYING ChangeLog
include *.cfg
include bodhi/templates/*.kid
+include bodhi/templates/*.html
include bodhi/config/*.cfg
include bodhi/config/*.conf
include bodhi/config/*.mash
14 years, 7 months
2 commits - bodhi/templates
by Luke Macken
bodhi/templates/show.kid | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 83be6017ccc3680f9e81f3060c451b165e9ad690
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 16 16:40:34 2009 -0400
Fix a tab problem
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index b8efb00..ea01bef 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -190,7 +190,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
title = 'Unable to fetch bug title'
cve = title.split()[0].replace(':', '')
if cve.startswith('CVE-'):
- title = '<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=' + cve + '">' + cve + '</a>' + ': ' + escape(' '.join(title.split()[1:]))
+ title = '<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=' + cve + '">' + cve + '</a>' + ': ' + escape(' '.join(title.split()[1:]))
?>
<a href="${bug.get_url()}">${bug.bz_id}</a> - ${XML(title)}
</div>
commit 9eb83afb96894f88accdcb4d027a3827d8a335d7
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 16 16:21:04 2009 -0400
Some more CSRF url fixes
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index d80d538..b8efb00 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -28,7 +28,7 @@ if len(update.builds) > 2:
else:
for build in update.builds:
nvr = util.get_nvr(build.nvr)
- title += "<a href=\"" + tg.url('/%s' % nvr[0]) + "\">" + nvr[0] + "</a>-" + '-'.join(nvr[-2:]) + ", "
+ title += "<a href=\"" + util.url('/%s' % nvr[0]) + "\">" + nvr[0] + "</a>-" + '-'.join(nvr[-2:]) + ", "
title = title[:-2]
release = util.link(update.release.long_name, '/' + update.release.name)
@@ -57,31 +57,31 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
<span py:if="not update.pushed">
<span py:if="'security_respons' in tg.identity.groups and update.type == 'security' and not update.approved">
<td>
- <a href="${tg.url('/approve/%s' % update.title)}" class="list"><img src="${tg.url('/static/images/submit.png')}" border="0" />Approve for Stable</a>
+ <a href="${util.url('/approve/%s' % update.title)}" class="list"><img src="${tg.url('/static/images/submit.png')}" border="0" />Approve for Stable</a>
</td>
</span>
<span py:if="update.request == None">
<td>
- <a href="${tg.url('/request/testing/%s' % update.title)}" class="list">
+ <a href="${util.url('/request/testing/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/testing.png')}" border="0"/>
Push to Testing
</a>
</td>
<td>
- <a href="${tg.url('/request/stable/%s' % update.title)}" class="list">
+ <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="${tg.url('/confirm_delete?nvr=%s' % update.title)}" class="list">
+ <a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/trash.png')}" border="0"/>
Delete
</a>
</td>
</span>
<td>
- <a href="${tg.url('/edit/%s' % update.title)}" class="list">
+ <a href="${util.url('/edit/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/edit.png')}" border="0"/>
Edit
</a>
@@ -89,7 +89,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</span>
<span py:if="update.pushed and update.status != 'stable'">
<td>
- <a href="${tg.url('/request/unpush/%s' % update.title)}" class="list">
+ <a href="${util.url('/request/unpush/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/revoke.png')}" border="0"/>
Unpush
</a>
@@ -97,14 +97,14 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
<span py:if="update.status == 'testing'">
<span py:if="update.request == None">
<td>
- <a href="${tg.url('/request/stable/%s' % update.title)}" class="list">
+ <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>
</span>
<td>
- <a href="${tg.url('/edit/%s' % update.title)}" class="list">
+ <a href="${util.url('/edit/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/edit.png')}" border="0"/>
Edit
</a>
@@ -113,7 +113,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</span>
<span py:if="update.pushed and update.status == 'stable' and 'releng' in tg.identity.groups">
<td>
- <a href="${tg.url('/request/unpush/%s' % update.title)}" class="list">
+ <a href="${util.url('/request/unpush/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/revoke.png')}" border="0"/>
Unpush
</a>
@@ -121,7 +121,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</span>
<span py:if="update.request != None">
<td>
- <a href="${tg.url('/revoke/%s' % update.title)}" class="list">
+ <a href="${util.url('/revoke/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/revoke.png')}" border="0"/>
Revoke request
</a>
@@ -190,7 +190,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
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:]))
+ title = '<a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=' + cve + '">' + cve + '</a>' + ': ' + escape(' '.join(title.split()[1:]))
?>
<a href="${bug.get_url()}">${bug.bz_id}</a> - ${XML(title)}
</div>
14 years, 7 months
bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/SOURCES.txt | 1 +
bodhi.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit e89b7233c594c2e1f72b21d2a0ec98a8cccdc979
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 13:10:33 2009 -0400
0.6.8
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 7ec28de..8e53add 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.6
+Version: 0.6.8
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 8e7779b..a8fa947 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -136,6 +136,7 @@ bodhi/templates/comments.kid
bodhi/templates/confirmation.kid
bodhi/templates/form.kid
bodhi/templates/list.kid
+bodhi/templates/login.kid
bodhi/templates/masher.kid
bodhi/templates/master.kid
bodhi/templates/metrics.kid
diff --git a/bodhi.spec b/bodhi.spec
index 797bbd4..57ed088 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.7
+Version: 0.6.8
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -115,6 +115,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Mon Sep 14 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.8-1
+- 0.6.8
+
* Wed Sep 09 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.7-1
- 0.6.7
14 years, 7 months
6 commits - apache/bodhi.conf apache/bodhi.wsgi bodhi/commands.py bodhi/config bodhi/controllers.py bodhi.egg-info/SOURCES.txt bodhi.egg-info/sqlobject.txt bodhi/model.py bodhi/new.py bodhi/release.py bodhi/rss.py bodhi/templates bodhi/util.py bodhi/widgets.py
by Luke Macken
apache/bodhi.conf | 11 +--
apache/bodhi.wsgi | 4 +
bodhi.egg-info/SOURCES.txt | 1
bodhi.egg-info/sqlobject.txt | 2
bodhi/commands.py | 4 +
bodhi/config/app.cfg | 1
bodhi/controllers.py | 14 +++-
bodhi/model.py | 4 -
bodhi/new.py | 4 -
bodhi/release.py | 4 -
bodhi/rss.py | 3
bodhi/templates/login.html | 28 ++++++++
bodhi/templates/master.html | 146 +++++++++++++++++++++++++++++++++++++++++++
bodhi/templates/pkg.kid | 4 -
bodhi/util.py | 10 ++
bodhi/widgets.py | 4 -
16 files changed, 224 insertions(+), 20 deletions(-)
New commits:
commit 0823405c82da48837063ea33c10789867a68a966
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 13:05:16 2009 -0400
0.6.8, and bring our WSGI app up to speed with Fedora infrastructure
diff --git a/apache/bodhi.conf b/apache/bodhi.conf
index aec4442..b7b8e74 100644
--- a/apache/bodhi.conf
+++ b/apache/bodhi.conf
@@ -1,16 +1,15 @@
Alias /updates/static /usr/share/bodhi/static
-WSGIDaemonProcess bodhi user=apache group=apache display-name=bodhi maximum-requests=1000 processes=2 threads=1
-
+WSGIDaemonProcess bodhi user=apache group=apache maximum-requests=1000 display-name=bodhi processes=2 threads=1
WSGISocketPrefix run/wsgi
WSGIRestrictStdout On
WSGIRestrictSignal Off
-WSGIPythonOptimize 2
+WSGIPythonOptimize 1
-WSGIScriptAlias /updates /usr/share/bodhi/bodhi.wsgi
+WSGIScriptAlias /updates /usr/share/bodhi/bodhi.wsgi/updates
-<Directory /usr/share/bodhi>
+<Location /updates>
WSGIProcessGroup bodhi
Order deny,allow
Allow from all
-</Directory>
+</Location>
diff --git a/bodhi/release.py b/bodhi/release.py
index 4db45d9..c331e94 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,9 +1,9 @@
-VERSION = '0.6.7'
+VERSION = '0.6.8'
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'
EMAIL = 'lmacken(a)redhat.com'
-COPYRIGHT = '2007-2008 Red Hat, Inc.'
+COPYRIGHT = '2007-2009 Red Hat, Inc.'
URL = 'https://fedorahosted.org/bodhi'
DOWNLOAD_URL = 'https://fedorahosted.org/releases/b/o/bodhi/'
LICENSE = 'GPLv2'
commit 49574994a710fe3cd67fd5a56e84ad5fea61073b
Merge: 81f6c88... 8baddfc...
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 13:02:05 2009 -0400
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi
Conflicts:
bodhi.egg-info/PKG-INFO
commit 81f6c882fbd09ec63b8076f304412ae0cf3b0e22
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 12:59:59 2009 -0400
Elaborate on our bugzilla error message
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 50e9f7d..6e60eff 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -781,7 +781,7 @@ class Root(controllers.RootController):
update.update_bugs(bugs)
except xmlrpclib.Fault, f:
log.exception(f)
- note.insert(0, "Unable to access one or more bugs")
+ note.insert(0, "Unable to access one or more bugs: %s" % str(f))
except Exception, e:
log.error("Unknown exception thrown from python-bugzilla!")
note.insert(0, "Unable to access one or more bugs. Exception: %s" % e)
commit e285b56af6111c356875a31aa86d55bdd3ae4341
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 12:58:45 2009 -0400
Add [optional] support for CSRF protection (#342)
To enable it, set identity.provider='sqlobjectcsrf' in your configuration.
However, the test suite does not work with CSRF protection enabled.
diff --git a/apache/bodhi.wsgi b/apache/bodhi.wsgi
index 0e11996..86e26f5 100644
--- a/apache/bodhi.wsgi
+++ b/apache/bodhi.wsgi
@@ -10,6 +10,7 @@ import atexit
import cherrypy
import cherrypy._cpwsgi
import turbogears
+from fedora.tg.util import enable_csrf
from bodhi.util import load_config
load_config()
@@ -19,6 +20,9 @@ turbogears.config.update({'global': {'autoreload.on': False}})
turbogears.config.update({'global': {'server.log_to_screen': False}})
#turbogears.config.update({'global': {'server.webpath': None}})
+if turbogears.config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
+ turbogears.startup.call_on_startup.append(enable_csrf)
+
from bodhi import jobs
turbogears.startup.call_on_startup.append(jobs.schedule)
diff --git a/bodhi/commands.py b/bodhi/commands.py
index 0959fd9..bb8a8c0 100644
--- a/bodhi/commands.py
+++ b/bodhi/commands.py
@@ -41,6 +41,10 @@ def start():
else:
load_config()
+ from fedora.tg.util import enable_csrf
+ if turbogears.config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
+ turbogears.startup.call_on_startup.append(enable_csrf)
+
## Schedule our periodic tasks
from bodhi import jobs
turbogears.startup.call_on_startup.append(jobs.schedule)
diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 5a99790..0cf1843 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -219,6 +219,7 @@ identity.on=True
# option must be specified.
identity.failure_url="/login"
+#identity.provider='sqlobjectcsrf'
#identity.provider='bugzilla'
# The names of the fields on the login form containing the visitor's user ID
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 03c5bbd..50e9f7d 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -32,6 +32,8 @@ from turbogears import (controllers, expose, validate, redirect, identity,
from turbogears.widgets import DataGrid
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
from bodhi import buildsys, util
from bodhi.rss import Feed
@@ -150,6 +152,11 @@ class Root(controllers.RootController):
@expose(template="bodhi.templates.login", allow_json=True)
def login(self, forward_url=None, previous_url=None, *args, **kw):
+ if config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
+ data = fc_login(forward_url, previous_url, args, kw)
+ data['tg_template'] = 'genshi:bodhi.templates.login'
+ return data
+
if not identity.current.anonymous and identity.was_login_attempted() \
and not identity.get_identity_errors():
if request_format() == 'json':
@@ -173,8 +180,11 @@ class Root(controllers.RootController):
original_parameters=cherrypy.request.params,
forward_url=forward_url)
- @expose()
+ @expose(allow_json=True)
def logout(self):
+ if config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
+ return fc_logout()
+
identity.current.logout()
raise redirect('/')
diff --git a/bodhi/model.py b/bodhi/model.py
index 1caaa8b..33cf17e 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -23,7 +23,7 @@ import xmlrpclib
from sqlobject import *
from datetime import datetime
-from turbogears import config, url
+from turbogears import config
from turbogears.database import PackageHub
from os.path import isfile, join
@@ -31,7 +31,7 @@ from textwrap import wrap
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
+from bodhi.util import Singleton, authorized_user, flash_log, build_evr, url
from bodhi.exceptions import RPMNotFound, InvalidRequest
from bodhi.identity.tables import *
diff --git a/bodhi/new.py b/bodhi/new.py
index ab20274..02369dd 100644
--- a/bodhi/new.py
+++ b/bodhi/new.py
@@ -16,8 +16,10 @@ import os
import logging
from os.path import join
+from turbogears import expose, controllers, identity, config, flash
+
from bodhi.widgets import NewUpdateForm
-from turbogears import expose, controllers, identity, config, url, flash
+from bodhi.util import url
log = logging.getLogger(__name__)
update_form = NewUpdateForm()
diff --git a/bodhi/rss.py b/bodhi/rss.py
index 3e715b7..22e8f5d 100644
--- a/bodhi/rss.py
+++ b/bodhi/rss.py
@@ -14,10 +14,11 @@
import logging
from turbogears.feed import FeedController
-from turbogears import config, url
+from turbogears import config
from sqlobject import SQLObjectNotFound
from sqlobject.sqlbuilder import AND
+from bodhi.util import url
from bodhi.model import Release, PackageUpdate, Comment
log = logging.getLogger(__name__)
diff --git a/bodhi/templates/pkg.kid b/bodhi/templates/pkg.kid
index 1782a0b..9d226e4 100644
--- a/bodhi/templates/pkg.kid
+++ b/bodhi/templates/pkg.kid
@@ -14,8 +14,8 @@
<blockquote>
<h1>${pkg.name}</h1>
<ul>
- <li><a href="http://bugz.fedoraproject.org/${pkg.name}">Open Bugs</a></li>
- <li><a href="https://admin.fedoraproject.org/pkgdb/packages/name/${pkg.name}">Package Database</a></li>
+ <li><a href="${tg.url('http://bugz.fedoraproject.org/%s' % (pkg.name,))}">Open Bugs</a></li>
+ <li><a href="${tg.url('https://admin.fedoraproject.org/pkgdb/packages/name/%s' % (pkg.name,))}">Package Database</a></li>
<li><a href="http://koji.fedoraproject.org/koji/search?terms=${pkg.name}&type=pack...">Koji Buildsystem</a></li>
</ul>
</blockquote>
diff --git a/bodhi/util.py b/bodhi/util.py
index a279146..cc48eb7 100644
--- a/bodhi/util.py
+++ b/bodhi/util.py
@@ -33,9 +33,10 @@ 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, url, flash, redirect
+from turbogears import config, flash, redirect, url as tg_url
from fedora.tg.util import request_format
from fedora.client import PackageDB
+from fedora.tg.util import url as csrf_url
from bodhi.exceptions import (RPMNotFound, RepodataException,
InvalidUpdateException)
@@ -499,3 +500,10 @@ def testing_statistics():
print "mean = %d days" % (accumulative.days / len(deltas))
print "median = %d days" % deltas[len(deltas) / 2].days
print "mode = %d days" % mode
+
+
+def url(*args, **kw):
+ if config.get('identity.provider') in ('sqlobjectcsrf', 'jsonfas2'):
+ return csrf_url(*args, **kw)
+ else:
+ return tg_url(*args, **kw)
diff --git a/bodhi/widgets.py b/bodhi/widgets.py
index c2b63ab..bf2f98f 100644
--- a/bodhi/widgets.py
+++ b/bodhi/widgets.py
@@ -13,13 +13,13 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from tgcaptcha import CaptchaField
-from turbogears import validators, url, config
+from turbogears import validators, config
from turbogears.widgets import (Form, TextField, SubmitButton, TextArea,
AutoCompleteField, SingleSelectField, CheckBox,
HiddenField, RemoteForm, CheckBoxList, JSLink,
DataGrid, CSSLink)
-from bodhi.util import make_update_link
+from bodhi.util import make_update_link, url
from bodhi.validators import *
class CommentForm(Form):
commit 74fcf40e057465b76821e66a6770875d4bfbcd8e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 12:57:15 2009 -0400
Add some initial master/login Genshi templates for CSRF support
diff --git a/bodhi/templates/login.html b/bodhi/templates/login.html
new file mode 100644
index 0000000..23e4e33
--- /dev/null
+++ b/bodhi/templates/login.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+ <xi:include href="master.html" />
+ <?python
+ import gettext
+ translation = gettext.translation('bodhi', '/usr/share/locale', fallback=True)
+ _ = translation.ugettext
+ ?>
+ <xi:include href="${tg.fedora_template('login.html')}" />
+
+
+<head>
+ <meta content="text/html; charset=UTF-8"
+ http-equiv="content-type" py:replace="''"/>
+ <title>Login</title>
+</head>
+
+<body onload="document.login.user_name.focus()">
+ <blockquote>
+ <h1 class="padded">Fedora Update System</h1>
+ <p class="padded">${message}<br/>
+ Hint: Use your Fedora username, not your e-mail address.</p>
+ </blockquote>
+ <loginform>${message}</loginform>
+</body>
+</html>
diff --git a/bodhi/templates/master.html b/bodhi/templates/master.html
new file mode 100644
index 0000000..3d9ef20
--- /dev/null
+++ b/bodhi/templates/master.html
@@ -0,0 +1,146 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<head py:match="head" py:attrs="select('@*')">
+ <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+ <meta name="robots" content="noindex,nofollow" />
+ <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="${tg.url('/static/images/favicon.ico')}" />
+ <link rel="shortcut icon" type="image/x-icon" href="${tg.url('/static/images/favicon.ico')}" />
+ <title py:replace="''">Your title goes here</title>
+ <script type="text/javascript" charset="utf-8" src="${tg.url('/static/js/jquery.js')}"></script>
+ <script type="text/javascript" charset="utf-8" src="${tg.url('/static/js/jquery.corner.js')}"></script>
+
+ <meta py:replace="select('*|text()')"/>
+
+ <style type="text/css" media="screen">
+ @import "${tg.url('/static/css/layout.css')}";
+ </style>
+</head>
+
+<body py:match="body" py:attrs="select('@*')">
+
+<?python
+from bodhi import version, hostname
+from bodhi.model import Release, PackageUpdate, Releases
+from bodhi.search import search_form
+from sqlobject.sqlbuilder import AND
+?>
+
+<!-- Make any form submission change the bodhi logo into a spinner -->
+<script type="text/javascript">
+$(document).ready(function() {
+ $("form").submit( function() {
+ $("div[@id=bodhi-logo]").hide();
+ $("div[@id=wait]").show();
+ } );
+} );
+</script>
+<script type="text/javascript">
+ $(document).ready(function() {
+ $('div.flash').corner();
+ $('div.flash').show("slow");
+ });
+</script>
+
+ <!-- header BEGIN -->
+ <div id="fedora-header">
+ <div id="fedora-header-logo">
+ <a href="${tg.url('/')}"><img src="${tg.url('/static/images/header-fedora_logo.png')}" /></a>
+ </div>
+
+ <div id="fedora-header-items">
+ <table><tr><td> ${ET(search_form.display())} </td><td>
+ <div id="bodhi-logo">
+ <a href="${tg.url('/')}"><img src="${tg.url('/static/images/bodhi-icon-48.png')}" /></a>
+ </div>
+ <div id="wait" style="display: none">
+ <img src="${tg.url('/static/images/wait.gif')}" height="48" width="48"/>
+ </div>
+ </td></tr></table>
+ </div>
+ </div>
+
+ <div id="fedora-nav"></div>
+ <!-- header END -->
+
+ <!-- leftside BEGIN -->
+ <div id="fedora-side-left">
+ <div id="fedora-side-nav-label">Site Navigation:</div>
+ <div py:if="not tg.identity.anonymous and 'releng' in tg.identity.groups">
+ <ul id="fedora-side-nav">
+ <li><a id="administration" href="#">Administration</a></li>
+ <div id="adminlist">
+ <ul>
+ <li><a href="${tg.url('/admin/push')}">Requests</a></li>
+ <li><a href="${tg.url('/admin/masher')}">Masher</a></li>
+ </ul>
+ </div>
+ </ul>
+ </div>
+ <div py:if="not tg.identity.anonymous and 'security_respons' in tg.identity.groups">
+ <ul id="fedora-side-nav">
+ <li><a href="${tg.url('/security')}">Security Queue</a></li>
+ </ul>
+ </div>
+ <ul id="fedora-side-nav">
+ <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>
+ <li py:for="release in Releases().data">
+ <a id="${release['name']}" href="${tg.url('/%s' % release['name'])}">${release['long_name']}</a>
+ <div id="${release['name']}_releases">
+ <ul>
+ <li class="release">
+ <a href="${tg.url('/metrics?release=%s' % release['name'])}" class="link">Metrics</a><a href="${tg.url('/metrics?release=%s' % release['name'])}" class="rsslink"><img src="${tg.url('/static/images/metrics-small.png')}"/></a>
+ </li>
+ <li py:for="status in ('pending', 'testing', 'stable')" class="release">
+ <a href="${tg.url('/%s/%s' % (release['name'], status != 'stable' and status or ''))}" class="link">${status.title()} (${release['num_' + status]})</a> <a href="${tg.url('/rss/rss2.0?release=%s&status=%s' % (release['name'], status))}" class="rsslink"><img src="${tg.url('/static/images/rss.png')}" /></a>
+ </li>
+ <li class="release">
+ <a href="${tg.url('/%s/security' % release['name'])}" class="link">Security (${release['num_security']})</a> <a href="${tg.url('/rss/rss2.0?release=%s&type=security' % release['name'])}" class="rsslink"><img src="${tg.url('/static/images/rss.png')}" /></a>
+ </li>
+ </ul>
+ </div>
+ </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>
+ <!-- leftside END -->
+
+ <!-- content BEGIN -->
+ <div id="fedora-middle-two">
+ <div class="fedora-corner-tr"></div>
+ <div class="fedora-corner-tl"></div>
+
+ <div id="fedora-content">
+
+ <div id="page-main">
+
+ <center>
+ <div style="display: none;" id="flash" py:if="tg_flash" class="flash" py:content="tg_flash"></div>
+ </center>
+ <div py:replace="select('*|text()')" />
+ </div>
+ </div>
+ <div class="fedora-corner-br"></div>
+ <div class="fedora-corner-bl"></div>
+ </div>
+ <!-- content END -->
+
+ <!-- footer BEGIN -->
+ <div id="fedora-footer">
+ Bodhi Version: ${version} -- Server: ${hostname}<br/>
+ Copyright © 2007-2008 Red Hat, Inc. and others. All Rights Reserved.<br/>
+ Licensed under the GNU Public License v2 or later.<br />
+ The Fedora Project is maintained and driven by the community and sponsored by Red Hat.<br/>This is a community maintained site. Red Hat is not responsible for content.<br/>
+ [ <a href="http://fedoraproject.org/wiki/Legal">Legal</a>, <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a> ]
+ </div>
+ <!-- footer END -->
+
+</body>
+</html>
commit 6ecfa8ed2caa8e036301677fe1416e1e19bb8e09
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Aug 11 16:58:26 2009 -0400
Stupid merge conflict
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 55e00f9..8aa179f 100644
--- a/bodhi.egg-info/PKG-INFO
+++ b/bodhi.egg-info/PKG-INFO
@@ -1,6 +1,10 @@
Metadata-Version: 1.0
Name: bodhi
+<<<<<<< Updated upstream:bodhi.egg-info/PKG-INFO
Version: 0.6.2
+=======
+Version: 0.6.3
+>>>>>>> Stashed changes:bodhi.egg-info/PKG-INFO
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 f956a4c..ad6a33f 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -136,7 +136,6 @@ bodhi/templates/comments.kid
bodhi/templates/confirmation.kid
bodhi/templates/form.kid
bodhi/templates/list.kid
-bodhi/templates/login.kid
bodhi/templates/masher.kid
bodhi/templates/master.kid
bodhi/templates/metrics.kid
diff --git a/bodhi.egg-info/sqlobject.txt b/bodhi.egg-info/sqlobject.txt
new file mode 100644
index 0000000..dc9ca11
--- /dev/null
+++ b/bodhi.egg-info/sqlobject.txt
@@ -0,0 +1,2 @@
+db_module=bodhi.model
+history_dir=$base/bodhi/sqlobject-history
14 years, 7 months
4 commits - bodhi/metadata.py bodhi/model.py bodhi/release.py bodhi.spec bodhi/tests
by Luke Macken
bodhi.spec | 11 ++++++++++-
bodhi/metadata.py | 17 +++++++++++------
bodhi/model.py | 6 +++++-
bodhi/release.py | 2 +-
bodhi/tests/test_metadata.py | 3 +++
5 files changed, 30 insertions(+), 9 deletions(-)
New commits:
commit 8baddfcf92bfa8ad0a392fcf9c8d99a46b8149c1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 11:26:55 2009 -0400
Ensure the bug title persists in our updateinfo (#493098)
diff --git a/bodhi/metadata.py b/bodhi/metadata.py
index 3a48d8c..e9bbab6 100644
--- a/bodhi/metadata.py
+++ b/bodhi/metadata.py
@@ -148,11 +148,14 @@ class ExtendedMetadata:
## Build the references
refs = self.doc.createElement('references')
for ref in notice._md['references']:
- self._insert(refs, 'reference', attrs={
- 'type' : ref['type'],
- 'href' : ref['href'],
- 'id' : ref['id']
- })
+ attrs = {
+ 'type' : ref['type'],
+ 'href' : ref['href'],
+ 'id' : ref['id'],
+ }
+ if ref.get('title'):
+ attrs['title'] = ref['title']
+ self._insert(refs, 'reference', attrs=attrs)
root.appendChild(refs)
## Errata description
diff --git a/bodhi/tests/test_metadata.py b/bodhi/tests/test_metadata.py
index ca7905d..c0db24d 100644
--- a/bodhi/tests/test_metadata.py
+++ b/bodhi/tests/test_metadata.py
@@ -111,6 +111,7 @@ class TestExtendedMetadata(testutil.DBTest):
update.addPackageBuild(build)
bug = Bugzilla(bz_id=1)
+ bug.title = u'test bug'
update.addBugzilla(bug)
cve = CVE(cve_id="CVE-2007-0000")
update.addCVE(cve)
@@ -152,6 +153,7 @@ class TestExtendedMetadata(testutil.DBTest):
assert bug['href'] == update.bugs[0].get_url()
assert bug['id'] == '1'
assert bug['type'] == 'bugzilla'
+ assert bug['title'] == 'test bug'
# FC6's yum update metadata parser doesn't know about some stuff
from yum import __version__
@@ -187,6 +189,7 @@ class TestExtendedMetadata(testutil.DBTest):
assert bug['href'] == update.bugs[0].get_url()
assert bug['id'] == '1'
assert bug['type'] == 'bugzilla'
+ assert bug['title'] == 'test bug', bug
# FC6's yum update metadata parser doesn't know about some stuff
from yum import __version__
commit ae01c865d190dd2d94dc006e8dd246c5b9823e02
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Sep 14 09:59:35 2009 -0400
Mutable default keyword arguments for the lose.
diff --git a/bodhi/metadata.py b/bodhi/metadata.py
index 8ce565e..3a48d8c 100644
--- a/bodhi/metadata.py
+++ b/bodhi/metadata.py
@@ -108,8 +108,10 @@ class ExtendedMetadata:
updates = self.doc.createElement('updates')
self.doc.appendChild(updates)
- def _insert(self, parent, name, attrs={}, text=None):
+ def _insert(self, parent, name, attrs=None, text=None):
""" Helper function to trivialize inserting an element into the doc """
+ if not attrs:
+ attrs = {}
child = self.doc.createElement(name)
for item in attrs.items():
child.setAttribute(item[0], unicode(item[1]))
commit 64f9acdfd1ed8ee6008645c33b13550b04421b0b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 9 16:42:43 2009 -0400
0.6.7
diff --git a/bodhi.spec b/bodhi.spec
index 002bf0d..797bbd4 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.6
+Version: 0.6.7
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -115,6 +115,15 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Wed Sep 09 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.7-1
+- 0.6.7
+
+* Wed Sep 09 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.6-1
+- 0.6.6
+
+* Wed Sep 09 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.5-1
+- 0.6.5
+
* Fri Aug 14 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.4-1
- 0.6.4
diff --git a/bodhi/release.py b/bodhi/release.py
index 53acf35..4db45d9 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.6'
+VERSION = '0.6.7'
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 8a1fc5bcff92921a97f3ebcb95009a87723f5c93
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Sep 9 16:40:52 2009 -0400
Make our bugzilla title handling a little more robust with regard to unicode
diff --git a/bodhi/model.py b/bodhi/model.py
index 1caaa8b..3a2fc01 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -895,7 +895,11 @@ class Bugzilla(SQLObject):
return
if bug.product == 'Security Response':
self.parent = True
- self.title = str(bug.short_desc)
+ try:
+ self.title = bug.short_desc
+ except Exception, e:
+ log.error("Unable to decode bug title: %s" % e)
+ self.title = 'Unable to decode bug title'
if 'security' in bug.keywords.lower():
self.security = True
14 years, 7 months
2 commits - bodhi.egg-info/PKG-INFO bodhi/masher.py bodhi/release.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 2 +-
bodhi/masher.py | 11 +++++++----
bodhi/release.py | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 78bbba3d3eddfb409448e412bbe5d32fc1acf56d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Sep 1 11:20:53 2009 -0400
v0.6.6
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 67c18b1..7ec28de 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.5
+Version: 0.6.6
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 f0be526..002bf0d 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.5
+Version: 0.6.6
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
diff --git a/bodhi/release.py b/bodhi/release.py
index 53c4265..53acf35 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.5'
+VERSION = '0.6.6'
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 5999bc1c9a8593b3c291fa6454a4e24a228e454c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Sep 1 11:20:04 2009 -0400
Fix our masher to work when mashing with *zero* updates
diff --git a/bodhi/masher.py b/bodhi/masher.py
index bb67e51..c890d92 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -167,10 +167,13 @@ class MashTask(Thread):
self.tag = None
self.updates = set()
map(self.updates.add, updates)
- up = self.updates.pop()
- self.updates.add(up)
- # eg: MASHING-FEDORA, MASHING-FEDORA-EPEL
- self.mash_lock_id = up.release.id_prefix
+ if self.updates:
+ up = self.updates.pop()
+ self.updates.add(up)
+ # eg: MASHING-FEDORA, MASHING-FEDORA-EPEL
+ self.mash_lock_id = up.release.id_prefix
+ else:
+ self.mash_lock_id = 'UNKNOWN'
self.koji = buildsys.get_session()
# which repos do we want to compose? (updates|updates-testing)
self.repos = repos
14 years, 7 months
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 | 2 +-
bodhi/release.py | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit bbaf9dd3ae3e9935e46348486263affa5f640ba0
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Sep 1 10:50:07 2009 -0400
v0.6.5
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index dc1eefe..67c18b1 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.3
+Version: 0.6.5
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 690e787..a8fa947 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -164,6 +164,7 @@ bodhi/tests/test_controllers.py
bodhi/tests/test_metadata.py
bodhi/tests/test_model.py
bodhi/tests/test_util.py
+bodhi/tools/0day.py
bodhi/tools/__init__.py
bodhi/tools/clean-testing.py
bodhi/tools/client.py
diff --git a/bodhi.spec b/bodhi.spec
index fb12033..f0be526 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.4
+Version: 0.6.5
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
diff --git a/bodhi/release.py b/bodhi/release.py
index a8d8779..53c4265 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.4'
+VERSION = '0.6.5'
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'
14 years, 7 months