2 commits - bodhi/config 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 | 2 ++
bodhi.spec | 5 ++++-
bodhi/config/f11-updates-testing.mash | 1 +
bodhi/config/f11-updates.mash | 1 +
bodhi/release.py | 2 +-
6 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit bdb1aad2f343f00aab0e2d74333c5d90acd69ffd
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 7 13:26:13 2009 -0400
0.5.23
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 30114d0..ab29c90 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.22
+Version: 0.5.23
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 15f30f5..e97def5 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -40,6 +40,8 @@ bodhi/config/__init__.py
bodhi/config/app.cfg
bodhi/config/f10-updates-testing.mash
bodhi/config/f10-updates.mash
+bodhi/config/f11-updates-testing.mash
+bodhi/config/f11-updates.mash
bodhi/config/f7-updates-testing.mash
bodhi/config/f7-updates.mash
bodhi/config/f8-updates-testing.mash
diff --git a/bodhi.spec b/bodhi.spec
index b0f3085..4fd0076 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.22
+Version: 0.5.23
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
+* Thu May 07 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.23-1
+- Add mash configs for F11, with deltarpm support.
+
* Thu Apr 30 2009 Luke Macken <lmacken(a)redhat.com> - 0.5.22-1
- Remove pagination patch, as Fedora Infrastructure is now TG 1.0.8
diff --git a/bodhi/release.py b/bodhi/release.py
index 9c6242e..fedab08 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.5.22'
+VERSION = '0.5.23'
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 306714f6b05a881285104ac98d26ee6e7300e46c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 7 13:25:00 2009 -0400
Specify delta_dirs in our F11 mash configs
diff --git a/bodhi/config/f11-updates-testing.mash b/bodhi/config/f11-updates-testing.mash
index 09e0550..6c3b678 100644
--- a/bodhi/config/f11-updates-testing.mash
+++ b/bodhi/config/f11-updates-testing.mash
@@ -14,3 +14,4 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing
repoviewtitle = "Fedora 11 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
delta = True
+delta_dirs = /mnt/koji/mash/rawhide
diff --git a/bodhi/config/f11-updates.mash b/bodhi/config/f11-updates.mash
index dc90b46..08eda61 100644
--- a/bodhi/config/f11-updates.mash
+++ b/bodhi/config/f11-updates.mash
@@ -14,3 +14,4 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/11/%(ar
repoviewtitle = "Fedora 11 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
delta = True
+delta_dirs = /mnt/koji/mash/rawhide
15 years
bodhi/config
by Luke Macken
bodhi/config/f10-updates-testing.mash | 1 +
bodhi/config/f10-updates.mash | 1 +
bodhi/config/f11-updates-testing.mash | 16 ++++++++++++++++
bodhi/config/f11-updates.mash | 16 ++++++++++++++++
bodhi/config/f9-updates-testing.mash | 1 +
bodhi/config/f9-updates.mash | 1 +
6 files changed, 36 insertions(+)
New commits:
commit 6957dca0557f95acafe374668d1edf3f86935e3e
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu May 7 13:17:53 2009 -0400
Add delta-enabled F11 mash configs and specify 'hash=sha' for F9/F10
diff --git a/bodhi/config/f10-updates-testing.mash b/bodhi/config/f10-updates-testing.mash
index 4a2cffc..357b1bb 100644
--- a/bodhi/config/f10-updates-testing.mash
+++ b/bodhi/config/f10-updates-testing.mash
@@ -13,3 +13,4 @@ keys = 0B86274E
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/10/%(a...
repoviewtitle = "Fedora 10 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
+hash = sha
diff --git a/bodhi/config/f10-updates.mash b/bodhi/config/f10-updates.mash
index 0ec550a..aa71a63 100644
--- a/bodhi/config/f10-updates.mash
+++ b/bodhi/config/f10-updates.mash
@@ -13,3 +13,4 @@ keys = 4EBFC273
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/10/%(arch)s/
repoviewtitle = "Fedora 10 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
+hash = sha
diff --git a/bodhi/config/f11-updates-testing.mash b/bodhi/config/f11-updates-testing.mash
new file mode 100644
index 0000000..09e0550
--- /dev/null
+++ b/bodhi/config/f11-updates-testing.mash
@@ -0,0 +1,16 @@
+# mash config file
+
+[f11-updates-testing]
+rpm_path = %(arch)s/
+source_path = SRPMS/
+debuginfo = True
+multilib = True
+multilib_method = devel
+tag = dist-f11-updates-testing
+inherit = False
+strict_keys = True
+keys = 0B86274E
+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
+delta = True
diff --git a/bodhi/config/f11-updates.mash b/bodhi/config/f11-updates.mash
new file mode 100644
index 0000000..dc90b46
--- /dev/null
+++ b/bodhi/config/f11-updates.mash
@@ -0,0 +1,16 @@
+# mash config file
+
+[f11-updates]
+rpm_path = %(arch)s/
+source_path = SRPMS/
+debuginfo = True
+multilib = True
+multilib_method = devel
+tag = dist-f11-updates
+inherit = False
+strict_keys = True
+keys = 4EBFC273
+repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/11/%(arch)s/
+repoviewtitle = "Fedora 11 Updates - %(arch)s"
+arches = i386 x86_64 ppc ppc64
+delta = True
diff --git a/bodhi/config/f9-updates-testing.mash b/bodhi/config/f9-updates-testing.mash
index f36a732..8f43ff1 100644
--- a/bodhi/config/f9-updates-testing.mash
+++ b/bodhi/config/f9-updates-testing.mash
@@ -14,3 +14,4 @@ keys = DF9B0AE9
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/9/%(ar...
repoviewtitle = "Fedora 9 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
+hash = sha
diff --git a/bodhi/config/f9-updates.mash b/bodhi/config/f9-updates.mash
index 02aec19..9ee06e7 100644
--- a/bodhi/config/f9-updates.mash
+++ b/bodhi/config/f9-updates.mash
@@ -14,3 +14,4 @@ keys = 6DF2196F
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/9/%(arch)s.new...
repoviewtitle = "Fedora 9 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
+hash = sha
15 years
bodhi/controllers.py bodhi/tests
by Luke Macken
bodhi/controllers.py | 20 ++++++++++++++++++++
bodhi/tests/test_controllers.py | 29 +++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
New commits:
commit b91a7f7c5d02addff785226eb60842778f531f0a
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon May 4 18:57:02 2009 -0400
Add a get_updates_from_builds JSON method, along with a test case.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 5da54b2..24d5fa0 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -179,6 +179,26 @@ class Root(controllers.RootController):
identity.current.logout()
raise redirect('/')
+ @expose('json')
+ @validate(validators={'builds': validators.UnicodeString()})
+ def get_updates_from_builds(self, builds=''):
+ """Given a list of build nvrs, return the corresponding updates.
+
+ :builds: A space-delimited list of builds in the format of
+ name-version-release
+
+ :returns: A dictionary in the format of {build: update_data}
+ """
+ updates = {}
+ for build in builds.split():
+ try:
+ b = PackageBuild.byNvr(build)
+ for update in b.updates:
+ updates[build] = update.__json__()
+ except SQLObjectNotFound:
+ pass
+ return updates
+
@expose(template="bodhi.templates.list", allow_json=True)
@paginate('updates', limit=20, max_limit=50, allow_limit_override=True)
@validate(validators={
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 2faad59..7991460 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1160,3 +1160,32 @@ class TestControllers(testutil.DBTest):
self.save_update(params, session)
update = PackageUpdate.byTitle(params['builds'])
assert update
+
+ def test_get_updates_from_builds(self):
+ session = login()
+ create_release()
+ params = {
+ 'builds' : 'TurboGears-1.0.2.2-2.fc7',
+ 'release' : 'Fedora 7',
+ 'type_' : 'enhancement',
+ 'bugs' : '1234',
+ 'cves' : 'CVE-2020-0001',
+ 'notes' : 'foobar'
+ }
+ self.save_update(params, session)
+ params = {
+ 'builds' : 'kernel-2.6.29.1-111.fc7.x86_64',
+ 'release' : 'Fedora 7',
+ 'type_' : 'enhancement',
+ 'bugs' : '1234',
+ 'notes' : 'New kernel.'
+ }
+ self.save_update(params, session)
+ testutil.create_request('/updates/get_updates_from_builds?builds=' +
+ 'kernel-2.6.29.1-111.fc7.x86_64%20TurboGears-1.0.2.2-2.fc7',
+ method='POST')
+ import simplejson
+ json = simplejson.loads(cherrypy.response.body[0])
+ assert 'kernel-2.6.29.1-111.fc7.x86_64' in json
+ assert 'TurboGears-1.0.2.2-2.fc7' in json
+ assert json['TurboGears-1.0.2.2-2.fc7']['notes'] == 'foobar'
15 years
bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit c2ad8ee3268305b2e8b11fc244eefaf5756b6a15
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Apr 30 20:36:33 2009 -0400
Catch PackageDB exceptions when trying to get the ACLs.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 0bf2961..5da54b2 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -539,6 +539,10 @@ class Root(controllers.RootController):
flash_log("Unable to access the package database. Please "
"notify an administrator in #fedora-admin")
raise InvalidUpdateException(params)
+ except Exception, e:
+ log.exception(e)
+ flash_log(str(e))
+ raise InvalidUpdateException(params)
# Verify that the user is either in the committers list, or is
# a member of a groups that has privileges to commit to this package
15 years