3 commits - bodhi/config bodhi/controllers.py bodhi/model.py bodhi/tools

[Luke Macken]

 bodhi/config/app.cfg  |    2 +-
 bodhi/controllers.py  |    1 +
 bodhi/model.py        |   11 +++++------
 bodhi/tools/client.py |    3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit fc368a313119ac909d36228d0657577f33870f1b
Author: Luke Macken <lmacken(a)redhat.com&gt;
Date:   Wed Jun 30 19:15:50 2010 -0400

    Hide obsolete updates in our critpath view (#447)

diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index bffb70d..37a18ad 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -1308,6 +1308,7 @@ class Root(controllers.RootController):
             releases = Release.select()
         for update in PackageUpdate.select(
                 AND(PackageUpdate.q.status != 'stable',
+                    PackageUpdate.q.status != 'obsolete',
                     OR(*[PackageUpdate.q.releaseID == release.id
                          for release in releases]))):
             if update.critpath:


commit 83470a6daea3abe7abbdefc2fa0be4489521c820
Author: Luke Macken <lmacken(a)redhat.com&gt;
Date:   Wed Jun 30 19:06:52 2010 -0400

    Spit out some extra authentication related debugging in the client (#533666)

diff --git a/bodhi/tools/client.py b/bodhi/tools/client.py
index 9598efb..6f68796 100755
--- a/bodhi/tools/client.py
+++ b/bodhi/tools/client.py
@@ -379,7 +379,8 @@ def main():
                 parser.print_help()
             break
 
-        except AuthError:
+        except AuthError, e:
+            log.debug('Caught AuthError: %s' % str(e))
             bodhi.password = getpass('Password for %s: ' % opts.username)
         except ServerError, e:
             log.exception(e)


commit a2561d966ac87c16fcb9a5552c902ee9348aa87f
Author: Luke Macken <lmacken(a)redhat.com&gt;
Date:   Wed Jun 30 19:05:18 2010 -0400

    Change the admin group ordering, and detection.

diff --git a/bodhi/config/app.cfg b/bodhi/config/app.cfg
index 67bcdf5..9813a99 100644
--- a/bodhi/config/app.cfg
+++ b/bodhi/config/app.cfg
@@ -74,7 +74,7 @@ release_team_address = None
 security_team = None
 
 # Superuser groups
-admin_groups = 'security_respons proventesters'
+admin_groups = 'proventesters security_respons'
 
 # Where do we send update announcements to ?
 # These variables should be named per: Release.prefix_id.lower()_announce_list
diff --git a/bodhi/model.py b/bodhi/model.py
index a63caa4..cd0320c 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -712,13 +712,12 @@ class PackageUpdate(SQLObject):
 
         # Add admin groups to usernames (eg: "lmacken (releng)")
         if not anonymous and author != 'bodhi':
-            admin_groups = config.get('admin_groups',
-                                      'releng qa security_respons').split()
-
+            admin_groups = config.get('admin_groups', '').split()
             try:
-                for group in list(identity.current.groups)[::-1]:
-                    if group in admin_groups:
-                        author += ' (%s)' % group
+                groups =  list(identity.current.groups)
+                for admin_group in admin_groups:
+                    if admin_group in groups:
+                        author += ' (%s)' % admin_group
                         break
             except RequestRequiredException:
                 # This happens when we're adding comments from the masher,