bodhi/templates
by Luke Macken
bodhi/templates/comments.kid | 1 -
bodhi/templates/list.kid | 1 -
bodhi/templates/mine.kid | 1 -
bodhi/templates/pending.kid | 1 -
bodhi/templates/search.kid | 1 -
bodhi/templates/testing.kid | 1 -
bodhi/templates/user.kid | 1 -
7 files changed, 7 deletions(-)
New commits:
commit 1d485d67fd25fb819a1f5d2a2061e915d7d2dec5
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat May 23 16:13:46 2009 -0400
Remove the 'all' link from our paginators (#322)
diff --git a/bodhi/templates/comments.kid b/bodhi/templates/comments.kid
index f2307d6..324dbc7 100644
--- a/bodhi/templates/comments.kid
+++ b/bodhi/templates/comments.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/list.kid b/bodhi/templates/list.kid
index d4fd2fc..9cb8ee7 100644
--- a/bodhi/templates/list.kid
+++ b/bodhi/templates/list.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/mine.kid b/bodhi/templates/mine.kid
index f32f06c..a119047 100644
--- a/bodhi/templates/mine.kid
+++ b/bodhi/templates/mine.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/pending.kid b/bodhi/templates/pending.kid
index 8a19767..fbd7553 100644
--- a/bodhi/templates/pending.kid
+++ b/bodhi/templates/pending.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/search.kid b/bodhi/templates/search.kid
index 015aa56..ed5f0cc 100644
--- a/bodhi/templates/search.kid
+++ b/bodhi/templates/search.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/testing.kid b/bodhi/templates/testing.kid
index 8043ae4..05dff2a 100644
--- a/bodhi/templates/testing.kid
+++ b/bodhi/templates/testing.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
diff --git a/bodhi/templates/user.kid b/bodhi/templates/user.kid
index 4b20b63..24f5502 100644
--- a/bodhi/templates/user.kid
+++ b/bodhi/templates/user.kid
@@ -15,7 +15,6 @@
href="${tg.paginate.get_href(page)}">${page}</a>
<b py:if="page == tg.paginate.current_page">${page}</b>
</span>
- <a href="?tg_paginate_limit=${num_items}">all</a>
</div>
<table class="list">
15 years
bodhi/exceptions.py bodhi/modifyrepo.py
by Luke Macken
bodhi/exceptions.py | 4 +-
bodhi/modifyrepo.py | 98 +++++++++++++++++++++++++++++++++-------------------
2 files changed, 66 insertions(+), 36 deletions(-)
New commits:
commit 0355c0932ae1aeb6a21eebc09f7a0592fd338d76
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed May 20 17:46:53 2009 -0400
Apply a patch from Seth Vidal to update our modifyrepo from upstream.
diff --git a/bodhi/exceptions.py b/bodhi/exceptions.py
index f6c1607..6d0e17f 100644
--- a/bodhi/exceptions.py
+++ b/bodhi/exceptions.py
@@ -12,6 +12,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+from createrepo.utils import MDError
+
class BodhiException(Exception):
pass
@@ -27,7 +29,7 @@ class RPMNotFound(BodhiException):
class RepositoryLocked(BodhiException):
pass
-class RepositoryNotFound(BodhiException):
+class RepositoryNotFound(MDError):
pass
class InvalidRequest(BodhiException):
diff --git a/bodhi/modifyrepo.py b/bodhi/modifyrepo.py
index e8593ec..bbf938d 100644
--- a/bodhi/modifyrepo.py
+++ b/bodhi/modifyrepo.py
@@ -1,5 +1,4 @@
-# $Id: modifyrepo.py,v 1.1 2006/12/07 07:19:41 lmacken Exp $
-#
+#!/usr/bin/env python
# This tools is used to insert arbitrary metadata into an RPM repository.
# Example:
# ./modifyrepo.py updateinfo.xml myrepo/repodata
@@ -18,19 +17,18 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
+# (C) Copyright 2006 Red Hat, Inc.
# Luke Macken <lmacken(a)redhat.com>
-
-"""
- This tool is in CVS HEAD of createrepo
-"""
+# modified by Seth Vidal 2008
import os
import sys
-import sha
-import gzip
+
+from createrepo.utils import checksum_and_rename, GzipFile, MDError
+from yum.misc import checksum
from xml.dom import minidom
-from bodhi.exceptions import RepositoryNotFound
+
class RepoMetadata:
@@ -38,12 +36,15 @@ class RepoMetadata:
""" Parses the repomd.xml file existing in the given repo directory. """
self.repodir = os.path.abspath(repo)
self.repomdxml = os.path.join(self.repodir, 'repomd.xml')
+ self.checksum_type = 'sha256'
if not os.path.exists(self.repomdxml):
- raise RepositoryNotFound, self.repomdxml
+ raise MDError, '%s not found' % self.repomdxml
self.doc = minidom.parse(self.repomdxml)
- def _insert_element(self, parent, name, attrs={}, text=None):
+ def _insert_element(self, parent, name, attrs=None, text=None):
child = self.doc.createElement(name)
+ if not attrs:
+ attrs = {}
for item in attrs.items():
child.setAttribute(item[0], item[1])
if text:
@@ -59,60 +60,79 @@ class RepoMetadata:
"""
md = None
if not metadata:
- raise Exception('metadata cannot be None')
+ raise MDError, 'metadata cannot be None'
if isinstance(metadata, minidom.Document):
md = metadata.toxml()
mdname = 'updateinfo.xml'
elif isinstance(metadata, str):
if os.path.exists(metadata):
- oldmd = file(metadata, 'r')
+ if metadata.endswith('.gz'):
+ oldmd = GzipFile(filename=metadata, mode='rb')
+ else:
+ oldmd = file(metadata, 'r')
md = oldmd.read()
oldmd.close()
mdname = os.path.basename(metadata)
else:
- raise Exception('%s not found' % metadata)
+ raise MDError, '%s not found' % metadata
else:
- raise Exception('invalid metadata type')
+ raise MDError, 'invalid metadata type'
## Compress the metadata and move it into the repodata
- mdname += '.gz'
+ if not mdname.endswith('.gz'):
+ mdname += '.gz'
mdtype = mdname.split('.')[0]
destmd = os.path.join(self.repodir, mdname)
- newmd = gzip.GzipFile(destmd, 'wb')
- newmd.write(md.encode('utf-8'))
+ newmd = GzipFile(filename=destmd, mode='wb')
+ newmd.write(md)
newmd.close()
print "Wrote:", destmd
- ## Read the gzipped metadata
- f = file(destmd, 'r')
- newmd = f.read()
- f.close()
+ open_csum = checksum(self.checksum_type, metadata)
+
+
+ csum, destmd = checksum_and_rename(destmd, self.checksum_type)
+ base_destmd = os.path.basename(destmd)
+
## Remove any stale metadata
for elem in self.doc.getElementsByTagName('data'):
if elem.attributes['type'].value == mdtype:
- self.doc.firstChild.removeChild(elem)
+ self.doc.firstChild.removeChild(elem)
+
## Build the metadata
root = self.doc.firstChild
+ root.appendChild(self.doc.createTextNode(" "))
data = self._insert_element(root, 'data', attrs={ 'type' : mdtype })
+ data.appendChild(self.doc.createTextNode("\n "))
+
self._insert_element(data, 'location',
- attrs={ 'href' : 'repodata/' + mdname })
- self._insert_element(data, 'checksum', attrs={ 'type' : 'sha' },
- text=sha.new(newmd).hexdigest())
+ attrs={ 'href' : 'repodata/' + base_destmd })
+ data.appendChild(self.doc.createTextNode("\n "))
+ self._insert_element(data, 'checksum',
+ attrs={ 'type' : self.checksum_type },
+ text=csum)
+ data.appendChild(self.doc.createTextNode("\n "))
self._insert_element(data, 'timestamp',
text=str(os.stat(destmd).st_mtime))
- self._insert_element(data, 'open-checksum', attrs={ 'type' : 'sha' },
- text=sha.new(md.encode('utf-8')).hexdigest())
+ data.appendChild(self.doc.createTextNode("\n "))
+ self._insert_element(data, 'open-checksum',
+ attrs={ 'type' : self.checksum_type },
+ text=open_csum)
+
+ data.appendChild(self.doc.createTextNode("\n "))
+ root.appendChild(self.doc.createTextNode("\n"))
- #print " type =", mdtype
- #print " location =", 'repodata/' + mdname
- #print " checksum =", sha.new(newmd).hexdigest()
- #print " timestamp =", str(os.stat(destmd).st_mtime)
- #print " open-checksum =", sha.new(md).hexdigest()
+ print " type =", mdtype
+ print " location =", 'repodata/' + mdname
+ print " checksum =", csum
+ print " timestamp =", str(os.stat(destmd).st_mtime)
+ print " open-checksum =", open_csum
## Write the updated repomd.xml
outmd = file(self.repomdxml, 'w')
self.doc.writexml(outmd)
+ outmd.write("\n")
outmd.close()
print "Wrote:", self.repomdxml
@@ -121,6 +141,14 @@ if __name__ == '__main__':
if len(sys.argv) != 3 or '-h' in sys.argv:
print "Usage: %s <input metadata> <output repodata>" % sys.argv[0]
sys.exit()
+ try:
+ repomd = RepoMetadata(sys.argv[2])
+ except MDError, e:
+ print "Could not access repository: %s" % str(e)
+ sys.exit(1)
+ try:
+ repomd.add(sys.argv[1])
+ except MDError, e:
+ print "Could not add metadata from file %s: %s" % (sys.argv[1], str(e))
+ sys.exit(1)
- repomd = RepoMetadata(sys.argv[2])
- repomd.add(sys.argv[1])
15 years
bodhi/util.py
by Luke Macken
bodhi/util.py | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 64380e07c073f4a6c4e72bb710d950ca5e2dc5d2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed May 20 16:18:00 2009 -0400
Update sanity_check_repodata to look for empty <id/> tags in the updateinfo.xml.gz,
since this cause the yum to explode.
diff --git a/bodhi/util.py b/bodhi/util.py
index 598c05c..9eec059 100644
--- a/bodhi/util.py
+++ b/bodhi/util.py
@@ -418,6 +418,12 @@ def sanity_check_repodata(myurl):
if errorstrings:
raise RepodataException(','.join(errorstrings))
+ updateinfo = os.path.join(myurl, 'updateinfo.xml.gz')
+ if os.path.exists(updateinfo):
+ ret = subprocess.call(['zgrep', '<id/>', 'updateinfo.xml.gz'])
+ if not retcode:
+ raise RepodataException('updateinfo.xml.gz contains empty ID tags')
+
def to_unicode(obj, encoding='utf-8'):
if isinstance(obj, basestring):
15 years
bodhi/model.py
by Luke Macken
bodhi/model.py | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 7986925db3d2f109a29fa3d80b6387abef305ef4
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed May 20 12:47:13 2009 -0400
Add a comment about the closing status of bugzillas
diff --git a/bodhi/model.py b/bodhi/model.py
index 813e076..ef7b9a1 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -907,6 +907,12 @@ class Bugzilla(SQLObject):
log.debug('Skipping bug modification, close_bugs == False')
def close_bug(self, update):
+ """Close this bugzilla with details from an update.
+
+ This method will only close Fedora bugs, and it will close them with
+ the status of `ERRATA`. For details on why this is so, see this
+ ticket: https://fedorahosted.org/bodhi/ticket/320
+ """
bz = Bugzilla.get_bz()
try:
ver = '-'.join(get_nvr(update.builds[0].nvr)[-2:])
15 years
bodhi/model.py
by Luke Macken
bodhi/model.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c568ba8ada749fcf3ece87dd4d301f52c5c5dbec
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed May 20 12:09:52 2009 -0400
Close bugs as ERRATA, instead of NEXTRELEASE (#320)
diff --git a/bodhi/model.py b/bodhi/model.py
index 3d7b48e..813e076 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -914,7 +914,7 @@ class Bugzilla(SQLObject):
if bug.product != 'Fedora':
log.warning("Not closing %r bug" % bug.product)
return
- bug.close('NEXTRELEASE', fixedin=ver)
+ bug.close('ERRATA', fixedin=ver)
except xmlrpclib.Fault, f:
log.error("Unable to close bug #%d: %s" % (self.bz_id, str(f)))
15 years
bodhi/metadata.py
by Luke Macken
bodhi/metadata.py | 1 -
1 file changed, 1 deletion(-)
New commits:
commit b02181237690e8e86f938db34091df9efda4c26e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 19:55:21 2009 -0400
Supress a very noisy metadata log message
diff --git a/bodhi/metadata.py b/bodhi/metadata.py
index 8eef7f8..b4fb953 100644
--- a/bodhi/metadata.py
+++ b/bodhi/metadata.py
@@ -115,7 +115,6 @@ class ExtendedMetadata:
def _add_notice(self, notice):
""" Add a yum.update_md.UpdateNotice to the metadata """
- log.debug("Adding UpdateNotice for %s" % notice['title'])
root = self._insert(self.doc.firstChild, 'update', attrs={
'type' : notice['type'],
15 years
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 | 6 +++++-
bodhi/controllers.py | 6 +++++-
bodhi/release.py | 2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit e15189819b8921f97b7e380fef4f7f5df7dbb3c1
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 13:09:44 2009 -0400
0.5.25
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index a6e247f..70a9487 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.24
+Version: 0.5.25
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 8a56859..5b3860d 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.24
+Version: 0.5.25
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -114,6 +114,10 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Tue May 12 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.25-1
+- Latest upstream bugfix release to work around some TG 1.0.8
+ brokenness, and make our masher a bit more robust.
+
* Tue May 12 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.24-1
- 0.5.24 bugfix release
diff --git a/bodhi/release.py b/bodhi/release.py
index 2f7e262..50a9347 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.5.24'
+VERSION = '0.5.25'
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 cb82103057cf8ddd29519cca99420c891535501b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 13:08:32 2009 -0400
Another hack to work around broken stacked validators
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 8a31c23..10a68bb 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -985,7 +985,7 @@ class Root(controllers.RootController):
@expose(allow_json=True)
@error_handler()
- @validate(validators={'karma': validators.Int()})
+ #@validate(validators={'karma': validators.Int()})
@validate(form=comment_form)
@identity.require(identity.not_anonymous())
def comment(self, text, title, karma=0, tg_errors=None):
@@ -997,6 +997,10 @@ class Root(controllers.RootController):
:karma: The karma of this comment (-1, 0, 1)
"""
+ try:
+ karma = int(karma)
+ except:
+ pass
if tg_errors:
flash_log(tg_errors)
elif karma not in (0, 1, -1):
15 years
3 commits - bodhi/controllers.py bodhi.egg-info/PKG-INFO bodhi.egg-info/SOURCES.txt bodhi/masher.py bodhi/release.py bodhi.spec
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/SOURCES.txt | 1 +
bodhi.spec | 5 ++++-
bodhi/controllers.py | 7 ++++++-
bodhi/masher.py | 1 +
bodhi/release.py | 2 +-
6 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 6c2ea251e224aa87c17c2c48cf1b06d6362b8212
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 12:56:41 2009 -0400
Work around broken stacked validators in TG 1.0.8 with regard to
our captcha widget.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index b68028b..8a31c23 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -935,13 +935,18 @@ class Root(controllers.RootController):
raise redirect("/")
@expose(template='bodhi.templates.show')
- @validate(validators={ 'karma' : validators.Int() })
+ # Stacked validators seem to be broken in TG 1.0.8
+ #@validate(validators={'karma': validators.Int()})
@validate(form=comment_captcha_form)
def captcha_comment(self, text, title, author, karma, captcha=None,
tg_errors=None):
if not captcha:
captcha = {}
try:
+ karma = int(karma)
+ except:
+ pass
+ try:
update = PackageUpdate.byTitle(title)
except SQLObjectNotFound:
flash_log("The specified update does not exist")
commit 4f9d075bb342fdc52dbdff77a12d10ac2e41d88e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 12:41:42 2009 -0400
0.5.24
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index ab29c90..a6e247f 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.23
+Version: 0.5.24
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 e97def5..c49d6c9 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -35,6 +35,7 @@ bodhi.egg-info/dependency_links.txt
bodhi.egg-info/entry_points.txt
bodhi.egg-info/not-zip-safe
bodhi.egg-info/requires.txt
+bodhi.egg-info/sqlobject.txt
bodhi.egg-info/top_level.txt
bodhi/config/__init__.py
bodhi/config/app.cfg
diff --git a/bodhi.spec b/bodhi.spec
index 4fd0076..8a56859 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.23
+Version: 0.5.24
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -114,6 +114,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Tue May 12 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.24-1
+- 0.5.24 bugfix release
+
* Thu May 07 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.23-1
- Add mash configs for F11, with deltarpm support.
diff --git a/bodhi/release.py b/bodhi/release.py
index fedab08..2f7e262 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.5.23'
+VERSION = '0.5.24'
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 e098847d624cdda79978415d7b2b7d239567ed0f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue May 12 12:41:03 2009 -0400
Remove the MASHING state lock if safe_to_move() fails.
This will make it so that subsequent push attempts will not
resume the failed push, where the builds have yet to be moved.
diff --git a/bodhi/masher.py b/bodhi/masher.py
index f83a9c1..10c7033 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -557,6 +557,7 @@ class MashTask(Thread):
try:
if not self.resume and not self.safe_to_move():
log.error("safe_to_move failed! -- aborting")
+ self._unlock()
masher.done(self)
return
else:
15 years
bodhi/config
by Luke Macken
bodhi/config/f11-updates-testing.mash | 2 +-
bodhi/config/f11-updates.mash | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3a9e1e0b8e7d071239431654280c8ff9db0e7de6
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri May 8 11:10:59 2009 -0400
Update our F11 mash configs with the correct GPG keys
diff --git a/bodhi/config/f11-updates-testing.mash b/bodhi/config/f11-updates-testing.mash
index 6c3b678..aaf3d51 100644
--- a/bodhi/config/f11-updates-testing.mash
+++ b/bodhi/config/f11-updates-testing.mash
@@ -9,7 +9,7 @@ multilib_method = devel
tag = dist-f11-updates-testing
inherit = False
strict_keys = True
-keys = 0B86274E
+keys = D22E77F2
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/11/%(a...
repoviewtitle = "Fedora 11 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
diff --git a/bodhi/config/f11-updates.mash b/bodhi/config/f11-updates.mash
index 08eda61..7e5beaf 100644
--- a/bodhi/config/f11-updates.mash
+++ b/bodhi/config/f11-updates.mash
@@ -9,7 +9,7 @@ multilib_method = devel
tag = dist-f11-updates
inherit = False
strict_keys = True
-keys = 4EBFC273
+keys = D22E77F2
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/11/%(arch)s/
repoviewtitle = "Fedora 11 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
15 years
bodhi/tools
by Luke Macken
bodhi/tools/client.py | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit cbe9542df72e2b1e1981230dd40cb43f29a3412f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 7 14:17:23 2009 -0400
Patch from Josh Boyer to allow specifying a type of update to push with -P (#302).
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index e06b841..89a4f2d 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -47,6 +47,9 @@ def get_parser():
help="Display the status of the Masher (releng only)")
parser.add_option("-P", "--push", action="store_true", dest="push",
help="Display and push any pending updates (releng only)")
+ parser.add_option("--push-type", action="append", type="string",
+ dest="push_type",
+ help="Types of updates to push (releng only)")
parser.add_option("-d", "--delete", action="store_true", dest="delete",
help="Delete an update")
parser.add_option("", "--file", action="store", type="string",
@@ -187,11 +190,19 @@ def main():
if not data.get('updates', None):
log.info(data.get('message', 'Unknown masher reply'))
raise AuthError
+ if opts.push_type:
+ fupdates = []
+ for ptype in opts.push_type:
+ fdata = filter(lambda x: x['type'] == ptype,
+ data['updates'])
+ fupdates += fdata
+ data['updates'] = fupdates
log.debug(data)
log.info("[ %d Pending Requests ]" % len(data['updates']))
for status in ('testing', 'stable', 'obsolete'):
updates = filter(lambda x: x['request'] == status,
data['updates'])
+
releases = {}
for update in updates:
releases.setdefault(update['release']['name'], []) \
15 years