bodhi/rss.py
by Luke Macken
bodhi/rss.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 635eb6aa5195b5a586ca80b0ccbdd416b5520dff
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Oct 19 07:19:03 2009 -0400
Use the turbogears.url method in our RSS feeds, since we don't want/need CSRF tokens there.
diff --git a/bodhi/rss.py b/bodhi/rss.py
index 22e8f5d..3e715b7 100644
--- a/bodhi/rss.py
+++ b/bodhi/rss.py
@@ -14,11 +14,10 @@
import logging
from turbogears.feed import FeedController
-from turbogears import config
+from turbogears import config, url
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__)
14 years, 5 months
4 commits - bodhi.egg-info/PKG-INFO bodhi/release.py bodhi.spec bodhi/templates bodhi/tools
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 5 ++++-
bodhi/release.py | 2 +-
bodhi/templates/master.html | 2 +-
bodhi/templates/master.kid | 2 +-
bodhi/tools/tagcheck.py | 19 +++++++++----------
6 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit 11630abc65822c1e75ad5ee1dc30ed8fc77fd7dc
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Oct 13 12:21:17 2009 -0400
Update bodhi-tagcheck to handle the new release API, to work with EPEL
diff --git a/bodhi/tools/tagcheck.py b/bodhi/tools/tagcheck.py
index 3794f78..5e54bb5 100755
--- a/bodhi/tools/tagcheck.py
+++ b/bodhi/tools/tagcheck.py
@@ -23,9 +23,9 @@ def main():
# Check for testing updates that aren't tagged properly
for update in PackageUpdate.select(PackageUpdate.q.status=='testing'):
+ dest_tag = update.release.testing_tag
for build in update.builds:
tags = [tag['name'] for tag in koji.listTags(build=build.nvr)]
- dest_tag = '%s-updates-testing' % update.release.dist_tag
if dest_tag not in tags:
print "%s marked as testing, but tagged with %s" % (build.nvr,
tags)
@@ -34,7 +34,7 @@ def main():
# Check all candidate updates to see if they are in a different bodhi state
for release in Release.select():
- tag = '%s-updates-candidate' % release.dist_tag
+ tag = release.candidate_tag
tagged = [build['nvr'] for build in koji.listTagged(tag)]
for nvr in tagged:
try:
@@ -45,11 +45,11 @@ def main():
update.status,
tag)
if '--fix' in sys.argv:
- dest = '%s-updates-testing' % release.dist_tag
+ dest = release.testing_tag
if update.status == 'stable':
- dest = '%s-updates' % release.dist_tag
+ dest = release.stable_tag
elif update.status == 'obsolete':
- dest = '%s-updates-candidate' % release.dist_tag
+ dest = release.candidate_tag
broke.add((tag, dest, nvr))
except SQLObjectNotFound:
pass
@@ -57,8 +57,7 @@ def main():
# Make sure that all builds in koji tagged as an update exist
# in bodhi, and are in the expect state.
for release in Release.select():
- for update_tag in ('updates-testing', 'updates'):
- tag = '%s-%s' % (release.dist_tag, update_tag)
+ for tag in (release.testing_tag, release.stable_tag):
tagged = [build['nvr'] for build in koji.listTagged(tag)]
for nvr in tagged:
try:
@@ -74,11 +73,11 @@ def main():
print "%s is %s in bodhi but tagged as %s in koji" % (
update.title, update.status, tag)
if '--fix' in sys.argv:
- dest = '%s-updates-testing' % release.dist_tag
+ dest = release.testing_tag
if update.status == 'stable':
- dest = '%s-updates' % release.dist_tag
+ dest = release.stable_tag
elif update.status == 'obsolete':
- dest = '%s-updates-candidate' % release.dist_tag
+ dest = release.candidate_tag
for b in update.builds:
broke.add((tag, dest, b.nvr))
commit ef9b8d855e10193006893315017676a7a44b81f2
Merge: fcd879e... e4c4fac...
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Oct 7 08:32:44 2009 -0400
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/bodhi
commit fcd879e2fccaec0a2ef1900d897cb59305ffc755
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 19 20:50:20 2009 -0400
0.6.11
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 222b43d..bfe0150 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.10
+Version: 0.6.11
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 17b9208..60e5da3 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.10
+Version: 0.6.11
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
+* Sat Sep 19 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.11-1
+- 0.6.11
+
* Fri Sep 18 2009 Luke Macken <lmacken(a)redhat.com> - 0.6.10-1
- 0.6.10
diff --git a/bodhi/release.py b/bodhi/release.py
index e643046..46b243c 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.6.10'
+VERSION = '0.6.11'
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 3a6561a78432ba3c9b19e5f86a2072fe0c3f8347
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Sep 19 20:48:55 2009 -0400
Add a trailing slash to our new update link to quickly hack around
https://fedorahosted.org/fedora-infrastructure/ticket/1681
diff --git a/bodhi/templates/master.html b/bodhi/templates/master.html
index 3d9ef20..6ee26c8 100644
--- a/bodhi/templates/master.html
+++ b/bodhi/templates/master.html
@@ -87,7 +87,7 @@ $(document).ready(function() {
<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: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">
diff --git a/bodhi/templates/master.kid b/bodhi/templates/master.kid
index c245f74..3e0cb24 100644
--- a/bodhi/templates/master.kid
+++ b/bodhi/templates/master.kid
@@ -86,7 +86,7 @@ $(document).ready(function() {
<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: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">
14 years, 5 months