apache/bodhi.wsgi | 2 +-
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.egg-info/requires.txt | 1 -
bodhi.spec | 2 +-
bodhi/controllers.py | 34 ++++++++++++++--------------------
bodhi/model.py | 10 +++++-----
bodhi/release.py | 2 +-
bodhi/tools/client.py | 2 +-
setup.py | 2 +-
9 files changed, 25 insertions(+), 32 deletions(-)
New commits:
commit 86c9d354183c8597beca3f4f02327d2190b676b9
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 16:32:44 2011 -0400
0.8.3 bump
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 2bfa05c..d12f59a 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.8.1
+Version: 0.8.2
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 0ac96dd..8c737ac 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.8.1
+Version: 0.8.3
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 0c456f2..edae6f1 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.8.1'
+VERSION = '0.8.3'
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'
diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index 17e024c..00f0bb4 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -15,7 +15,7 @@
# Copyright 2007-2010 Red Hat, Inc
# Authors: Luke Macken <lmacken(a)redhat.com>
-__version__ = '0.7.12'
+__version__ = '0.8.3'
__description__ = 'Command line tool for interacting with Bodhi'
import sys
commit 52b04a6e295fe4f33406270edfaf8dd9416288de
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 15:19:45 2011 -0400
Don't expire overrides when unpushing, for now
diff --git a/bodhi/model.py b/bodhi/model.py
index 5af373f..e0ebcf7 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -945,11 +945,11 @@ class PackageUpdate(SQLObject):
log.debug('Tasks complete!')
# Expire any buildroot overrides
- try:
- self.expire_buildroot_overrides()
- except Exception, e:
- log.exception(e)
- log.error('There was non-fatal problem expiring the override')
+ #try:
+ # self.expire_buildroot_overrides()
+ #except Exception, e:
+ # log.exception(e)
+ # log.error('There was non-fatal problem expiring the override')
self.pushed = False
self.status = 'pending'
commit 483df9210ef0f18d82093fc3131fc691cc2803cd
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 15:11:28 2011 -0400
Markdown egg-info doesn't exist on RHEL5?
diff --git a/bodhi.egg-info/requires.txt b/bodhi.egg-info/requires.txt
index 6de723a..0cf4d0b 100644
--- a/bodhi.egg-info/requires.txt
+++ b/bodhi.egg-info/requires.txt
@@ -1,5 +1,4 @@
TurboGears >= 1.0
TurboMail
python_fedora
-markdown
CherryPy<3.0
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 3d297e8..fd1e801 100755
--- a/setup.py
+++ b/setup.py
@@ -165,7 +165,7 @@ setup(
"TurboGears >= 1.0",
"TurboMail",
"python_fedora",
- "markdown",
+ #"markdown",
"CherryPy<3.0",
#"hashlib",
],
commit ff413730dbf8c6f1f443cedee5fce66a88e8dd8c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 15:04:38 2011 -0400
Remove a duplicate check while editing updates
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 73fb8c3..5909b85 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -715,13 +715,6 @@ class Root(controllers.RootController):
config.get('release_team_address'))
raise InvalidUpdateException(params)
- # Ensure all builds are for this release
- for b in buildinfo:
- if buildinfo[b]['release'] != edited.release:
- flash_log('Error: Unable to add build for a '
- 'different release to this update')
- raise InvalidUpdateException(params)
-
# Make sure the tag has not been moved, which indicates that we
# are in the middle of pushing this update
if edited.get_implied_build_tag() not in
buildinfo[builds[0]]['tags']:
commit 302a324de8e3a1c6f2adbebbb54cbac70640192f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 14:58:28 2011 -0400
Comment out our upgrade path check, as AutoQA does this for us now.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index d4ee72b..73fb8c3 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -869,19 +869,20 @@ class Root(controllers.RootController):
kojiBuild['release'])
# Check for broken update paths
- log.info("Checking for broken update paths")
- for release in buildinfo[build]['releases']:
- tags = ['dist-rawhide', release.dist_tag, release.stable_tag]
- for tag in tags:
- pkg = buildinfo[build]['nvr'][0]
- for oldBuild in koji.listTagged(tag, package=pkg,
- latest=True):
- if rpm.labelCompare(util.build_evr(kojiBuild),
- util.build_evr(oldBuild)) < 0:
- flash_log("Broken update path: %s is older "
- "than %s in %s" %
(kojiBuild['nvr'],
- oldBuild['nvr'], tag))
- raise InvalidUpdateException(params)
+ # OBSOLETED BY AUTOQA
+ #log.info("Checking for broken update paths")
+ #for release in buildinfo[build]['releases']:
+ # tags = ['dist-rawhide', release.dist_tag, release.stable_tag]
+ # for tag in tags:
+ # pkg = buildinfo[build]['nvr'][0]
+ # for oldBuild in koji.listTagged(tag, package=pkg,
+ # latest=True):
+ # if rpm.labelCompare(util.build_evr(kojiBuild),
+ # util.build_evr(oldBuild)) < 0:
+ # flash_log("Broken update path: %s is older "
+ # "than %s in %s" %
(kojiBuild['nvr'],
+ # oldBuild['nvr'], tag))
+ # raise InvalidUpdateException(params)
# Create all of the PackageBuild objects, obsoleting any older updates
for build in builds:
commit 4f1ea3c3b4f4b63342301bbe2814974ae2493d39
Author: Luke Macken <lmacken(a)redhat.com>
Date: Fri Oct 7 14:55:53 2011 -0400
Pull in all of the bodhi requirements in our wsgi app, not just TG
diff --git a/apache/bodhi.wsgi b/apache/bodhi.wsgi
index 223b9ef..dc5d521 100644
--- a/apache/bodhi.wsgi
+++ b/apache/bodhi.wsgi
@@ -2,7 +2,7 @@ import sys
sys.stdout = sys.stderr
import __main__
-__main__.__requires__ = __requires__ = 'TurboGears'
+__main__.__requires__ = __requires__ = 'bodhi'
import pkg_resources
pkg_resources.require(__requires__)