Repository : http://git.fedorahosted.org/cgit/ On branch : master commit a6e04720c0e2e94340f800bd56fd1645ad9eb471 Author: Matt Domsch <matt(a)domsch.com&gt; Date: Fri Jul 19 16:37:34 2013 -0500 fix use of orderBy in select statements proper use is select().orderBy(), not select(orderBy=...). Otherwise failure ensues. server/errorcheck | 2 +- server/generate-publiclist | 2 +- server/mirrormanager/controllers.py | 6 +++--- server/mirrormanager/model.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/errorcheck b/server/errorcheck index a3ca134..cb11a99 100755 --- a/server/errorcheck +++ b/server/errorcheck @@ -450,7 +450,7 @@ def doit(): if len(options.site): sites = [Site.get(id) for id in options.site] else: - sites = Site.select(orderBy='id') + sites = Site.select().orderBy('id') for site in sites: try: diff --git a/server/generate-publiclist b/server/generate-publiclist index 0e1e22f..64c923c 100755 --- a/server/generate-publiclist +++ b/server/generate-publiclist @@ -176,7 +176,7 @@ def generate_one_html(engine, pvaMatrix, productname=None, vername=None, archnam template_data = dict(page_title=title, hosts=hosts, numhosts=len(hosts), bandwidth=bandwidth, pvaMatrix=pvaMatrix, pva=pva, - products=list(Product.select(orderBy='name')), + products=list(Product.select().orderBy('name')), arches=publiclist_arches(), report_problems_to_email = config.get('mirrormanager.report_problems_to_email', 'webmaster'), utcnow = dt.datetime.utcnow()) diff --git a/server/mirrormanager/controllers.py b/server/mirrormanager/controllers.py index 28efdc7..a1d2696 100644 --- a/server/mirrormanager/controllers.py +++ b/server/mirrormanager/controllers.py @@ -237,7 +237,7 @@ class SiteAdminController(controllers.Controller, identity.SecureResource, conte ############################################## class SiteToSiteFields(widgets.WidgetsList): def get_sites_options(): - return [(s.id, s.name) for s in Site.select(orderBy='name')] + return [(s.id, s.name) for s in Site.select().orderBy('name')] sites = widgets.MultipleSelectField(options=get_sites_options, size=15, validator=validators.NotEmpty()) @@ -433,7 +433,7 @@ class HostController(controllers.Controller, identity.SecureResource, content): ##################################################################33 class HostCategoryFieldsNew(widgets.WidgetsList): def get_category_options(): - return [(c.id, c.name) for c in Category.select(orderBy='name')] + return [(c.id, c.name) for c in Category.select().orderBy('name')] category = widgets.SingleSelectField(options=get_category_options, validator=validators.NotEmpty()) always_up2date = widgets.CheckBox(default=False, help_text="Set to force belief that the whole category is always in sync.") @@ -856,7 +856,7 @@ class Root(controllers.RootController): @identity.require(identity.not_anonymous()) def help(self): if admin_group in identity.current.groups: - sites = Site.select(orderBy='name') + sites = Site.select().orderBy('name') else: sites = user_sites(identity) return {} diff --git a/server/mirrormanager/model.py b/server/mirrormanager/model.py index 6d88011..b988e54 100644 --- a/server/mirrormanager/model.py +++ b/server/mirrormanager/model.py @@ -661,7 +661,7 @@ class Arch(SQLObject): primaryArch = BoolCol(default=True) def publiclist_arches(): - return list(Arch.selectBy(publiclist=True, orderBy=['-primaryArch', 'name'])) + return list(Arch.selectBy(publiclist=True).orderBy(['-primaryArch', 'name'])) # e.g. 'fedora' and 'epel' class Product(SQLObject): @@ -681,7 +681,7 @@ class Product(SQLObject): @staticmethod def selectFieldOptions(): - return [(p.id, p.name) for p in Product.select(orderBy='name')] + return [(p.id, p.name) for p in Product.select().orderBy('name')] class Version(SQLObject):