summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Rossouw2010-06-18 06:01:47 (GMT)
committerAdrian Rossouw2010-06-18 06:01:47 (GMT)
commit533c66e8454ccc6227f0630106647e064b04dede (patch)
treecd8609281089029bc8b223892abc173acafe9e1d
parent8e9f56860de815d211c16b6d2d99628184ca563f (diff)
Add back the isolation from install time errors, passing back the login link.
-rw-r--r--platform/install.provision.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/platform/install.provision.inc b/platform/install.provision.inc
index 0e9f8e6..29dc5da 100644
--- a/platform/install.provision.inc
+++ b/platform/install.provision.inc
@@ -51,9 +51,13 @@ function drush_provision_drupal_provision_install() {
_provision_drupal_create_settings_file();
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
provision_save_site_data();
- drush_include_engine('drupal', 'install');
-
- #provision_backend_invoke(d()->name, "provision-install-backend");
+
+ // call a backend task to do the actual installation.
+ $result = provision_backend_invoke(d()->name, "provision-install-backend");
+ // pass the login link back to the front end.
+ drush_set_option('login_link', $result['context']['login_link']);
+
+ drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_FULL);
drush_set_option('installed', TRUE, 'site');
_provision_drupal_maintain_aliases();
}