Remove string exception from remaster.

[wizard.git] / wizard / app / wordpress.py

diff --git a/wizard/app/wordpress.py b/wizard/app/wordpress.py
index 6f6d68787650be0c7f1b720320ec51addaadd9fe..bf77db40058f0f7ed6b8f20a999c2fb8c525a7bd 100644 (file)
--- a/wizard/app/wordpress.py
+++ b/wizard/app/wordpress.py
@@ -81,7 +81,7 @@ class Application(app.Application):
                 'uname': options.dsn.username,
                 'dbname': options.dsn.database,
                 'pwd': options.dsn.password,
-                'prefix': '',
+                'prefix': 'wp_', # Changed >= 3.4, now disallows empty prefix
                 'submit': 'Submit',
                 'step': '2',
                 }
@@ -116,6 +116,7 @@ class Application(app.Application):
             raise app.InstallFailure()
 
         if version < distutils.version.LooseVersion("3.0"):
+            meta = sql.connect(options.dsn)
             wp_users = meta.tables["wp_users"]
             hashed_pass = hashlib.md5(options.admin_password).hexdigest()
             wp_users.update().where(wp_users.c.ID == 1).values(user_login=options.admin_name,user_nicename=options.admin_name,display_name=options.admin_name,user_pass=hashed_pass).execute()