bodhi/admin.py | 6 +++++-
bodhi/controllers.py | 6 +++++-
bodhi/metrics.py | 5 ++++-
bodhi/model.py | 6 +++++-
4 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 1e43dd04dcaf05ae27d9348dfea3c89ba85b8257
Author: Luke Macken <lmacken(a)redhat.com>
Date: Sat Feb 20 09:56:01 2010 -0500
Don't jump the gun on python-fedora tg1utils.
Apparently I was running the latest trunk of python-fedora, so this
patch makes bodhi work with all versions.
diff --git a/bodhi/admin.py b/bodhi/admin.py
index 793f477..b8aa36a 100644
--- a/bodhi/admin.py
+++ b/bodhi/admin.py
@@ -27,7 +27,11 @@ from turbogears import expose, identity, redirect, flash, config,
validate
from turbogears.identity import SecureResource
from turbogears.controllers import Controller
-from fedora.tg.tg1utils import request_format
+try:
+ from fedora.tg.tg1utils import request_format
+except ImportError:
+ from fedora.tg.util import request_format
+
from fedora.client.proxyclient import ProxyClient
from bodhi.util import flash_log
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 277c856..11a980a 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -32,7 +32,11 @@ from turbogears import (controllers, expose, validate, redirect,
identity,
from turbogears import url as tg_url
from turbogears.widgets import DataGrid
-from fedora.tg.tg1utils import request_format
+try:
+ from fedora.tg.tg1utils import request_format
+except ImportError:
+ from fedora.tg.tutil import request_format
+
from fedora.tg.controllers import login as fc_login
from fedora.tg.controllers import logout as fc_logout
diff --git a/bodhi/metrics.py b/bodhi/metrics.py
index a6096ea..09552ea 100644
--- a/bodhi/metrics.py
+++ b/bodhi/metrics.py
@@ -21,7 +21,10 @@ from turboflot import TurboFlot
from turbogears import expose, config, flash, redirect
from turbogears.controllers import Controller
-from fedora.tg.tg1utils import request_format
+try:
+ from fedora.tg.tg1utils import request_format
+except ImportError:
+ from fedora.tg.util import request_format
from bodhi.util import Singleton, get_age_in_days
from bodhi.model import PackageUpdate, Release, hub
diff --git a/bodhi/model.py b/bodhi/model.py
index 6e4caee..b1d23cd 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -30,7 +30,11 @@ from turbogears.identity import RequestRequiredException
from os.path import isfile, join
from textwrap import wrap
-from fedora.tg.tg1utils import tg_url
+try:
+ from fedora.tg.tg1utils import tg_url
+except ImpotError:
+ from fedora.tg.util import tg_url
+
from bodhi import buildsys, mail
from bodhi.util import get_nvr, rpm_fileheader, header, get_age, get_age_in_days
from bodhi.util import Singleton, authorized_user, flash_log, build_evr, url
Show replies by date