bodhi/controllers.py | 30 +++++++++++++++---------------
bodhi/model.py | 3 +--
setup.py | 2 ++
3 files changed, 18 insertions(+), 17 deletions(-)
New commits:
commit 854efbfaaa98cc3326f9be42202bec24d0eb0454
Merge: 6ffa2a6 dd36e4d
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Nov 26 10:22:13 2011 -0500
Merge branch 'master' of
git+ssh://git.fedorahosted.org/git/bodhi
commit 6ffa2a68abf107edcbe9757a3e8ed7332b333f32
Merge: 8d7c5cd 7724243
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Nov 16 12:58:58 2011 -0500
Merge branch 'master' of
git+ssh://git.fedorahosted.org/git/bodhi
commit 8d7c5cd10979f6e59a6f01b93cb87a92084510d2
Merge: 8a9f895 e72d070
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Oct 27 15:25:13 2011 -0400
Merge branch 'master' of
git+ssh://git.fedorahosted.org/git/bodhi
commit 8a9f895f94a541a10882565b0719294bc920eff2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Oct 18 13:51:48 2011 -0400
Merge
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 5909b85..aea71a3 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -629,19 +629,18 @@ class Root(controllers.RootController):
raise InvalidUpdateException(params)
# Make sure this update doesn't already exist
- if not edited:
- for build in builds:
- try:
- b = PackageBuild.byNvr(build)
- if request_format() == 'json':
- flash_log("%s update already exists!" % build)
- return dict()
- else:
- flash_log("%s update already exists!" %
- link(build, b.get_url()))
- raise redirect('/new', **params)
- except SQLObjectNotFound:
- pass
+ for build in builds:
+ try:
+ b = PackageBuild.byNvr(build)
+ if request_format() == 'json':
+ flash_log("%s update already exists!" % build)
+ return dict()
+ else:
+ flash_log("%s update already exists!" %
+ link(build, b.get_url()))
+ raise redirect('/new', **params)
+ except SQLObjectNotFound:
+ pass
# Make sure the submitter has commit access to these builds
for build in builds:
@@ -693,8 +692,9 @@ class Root(controllers.RootController):
# 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
if not identity.current.user_name in people and \
- not filter(lambda group: group in identity.current.groups,
- config.get('admin_groups').split()) and \
+ # Disallow admin_groups from pushing anything
+ #not filter(lambda group: group in identity.urrent.groups,
+ # config.get('admin_groups').split()) and \
not filter(lambda x: x in identity.current.groups, groups[0]):
flash_log("%s does not have commit access to %s" % (
identity.current.user_name, pkg))
diff --git a/bodhi/model.py b/bodhi/model.py
index e0ebcf7..eaef7f3 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -949,7 +949,6 @@ class PackageUpdate(SQLObject):
# 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'
@@ -985,7 +984,7 @@ class PackageUpdate(SQLObject):
self.remove_tag(self.release.pending_stable_tag)
# Expire any buildroot overrides
- self.expire_buildroot_overrides()
+ #self.expire_buildroot_overrides()
self.status = 'obsolete'
self.request = None
diff --git a/setup.py b/setup.py
index fd1e801..9c140de 100755
--- a/setup.py
+++ b/setup.py
@@ -167,6 +167,8 @@ setup(
"python_fedora",
#"markdown",
"CherryPy<3.0",
+ "kitchen",
+ "python-fedora",
#"hashlib",
],
scripts = [],