]> scripts.mit.edu Git - wizard.git/commitdiff
Fix minor type error in phpBB version detection.
authorEdward Z. Yang <ezyang@mit.edu>
Mon, 11 Jan 2010 00:43:59 +0000 (19:43 -0500)
committerEdward Z. Yang <ezyang@mit.edu>
Mon, 11 Jan 2010 00:43:59 +0000 (19:43 -0500)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
wizard/app/phpBB.py

index 49fbf4f2d09c0ab72280f91e2d17cbcedd33c923..ea767d1178dc2aae250880129e3bb80fe2f33e41 100644 (file)
@@ -1,6 +1,7 @@
 import shutil
 import logging
 import os.path
+import distutils.version
 
 from wizard import app, install, resolve, util
 from wizard.app import php
@@ -33,10 +34,10 @@ class Application(app.Application):
         return os.path.getsize('config.php')
 
     def detectVersion(self, deployment):
-        version = self.detectVersionFromFile('install/database_update.php', php.re_var('updates_to_version'))
+        version = str(self.detectVersionFromFile('install/update_to_latest.php', php.re_var('updates_to_version')))
         if version.startswith('.'): # blehh, but phpBB2 uses '.0.19'...
             version = '2' + version
-        return version
+        return distutils.version.LooseVersion(version)
 
     def remove(self, deployment, options):
         app.remove_database(deployment)