semantic version support in admin

gluon/fileutils.py

@@ -67,11 +67,10 @@ def parse_legacy(version="Version 1.99.0 (2011-09-19 08:23:26)"):
     return (a, b, c, pre_release, build)
 
 def parse_version(version):
-    items = parse_semantic(version)
-    if not items:
-        items = parse_legacy(version)
-    (a, b, c, pre_release, build) = items
-    return (a, b, c, build, pre_release) # build, pre_releas intentionally reversed
+    version_tuple = parse_semantic(version)
+    if not version_tuple:
+        version_tuple = parse_legacy(version)
+    return version_tuple
 
 def read_file(filename, mode='r'):
     "returns content from filename, making sure to close the file explicitly on exit."

gluon/main.py

@@ -101,13 +101,14 @@ requests = 0    # gc timer
 # pattern used to validate client address
 regex_client = re.compile('[\w\-:]+(\.[\w\-]+)*\.?')  # ## to account for IPV6
 
-try:
+#try:
+if 1:
     version_info = open(pjoin(global_settings.gluon_parent, 'VERSION'), 'r')
     raw_version_string = version_info.read().strip()
     version_info.close()
     global_settings.web2py_version = parse_version(raw_version_string)
-except:
-    raise RuntimeError("Cannot determine web2py version")
+#except:
+#    raise RuntimeError("Cannot determine web2py version")
 
 web2py_version = global_settings.web2py_version