From 675245eb1564e55508a546b5e28e9a0e30796e26 Mon Sep 17 00:00:00 2001 From: Massimo Date: Thu, 21 Mar 2013 11:21:53 -0500 Subject: [PATCH] fixed issue 1398, brackets in libspatialite load extension, thanks rmdpedroso --- VERSION | 2 +- applications/admin/controllers/default.py | 2 +- gluon/dal.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 3cae9a24..e0c78d1c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.5-stable+timestamp.2013.03.18.22.48.15 +Version 2.4.5-stable+timestamp.2013.03.21.11.20.48 diff --git a/applications/admin/controllers/default.py b/applications/admin/controllers/default.py index 3a59d3c4..5c40ac95 100644 --- a/applications/admin/controllers/default.py +++ b/applications/admin/controllers/default.py @@ -146,7 +146,7 @@ def check_version(): elif new_version != True: return A(T('web2py is up to date'), _href=WEB2PY_URL) elif platform.system().lower() in ('windows', 'win32', 'win64') and os.path.exists("web2py.exe"): - return SPAN('You should upgrade to version %s.%s.%s' % version_number[:3]) + return SPAN('You should upgrade to version %s' % version_number) else: return sp_button(URL('upgrade_web2py'), T('upgrade now to %s') % version_number.split('-')[0]) diff --git a/gluon/dal.py b/gluon/dal.py index 9aeaeeda..c284b055 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2260,7 +2260,7 @@ class SpatiaLiteAdapter(SQLiteAdapter): # Linux uses libspatialite.so # Mac OS X uses libspatialite.dylib libspatialite = SPATIALLIBS[platform.system()] - self.execute(r'SELECT load_extension("%s");') % libspatialite + self.execute(r'SELECT load_extension("%s");' % libspatialite) self.connection.create_function('web2py_extract', 2, SQLiteAdapter.web2py_extract)