Commit dc2e70b9 authored by Jon Pugh's avatar Jon Pugh

Get rid of the helper function _provision_drupal_site_exists()

parent 14b2d2e3
......@@ -18,7 +18,7 @@ function drush_provision_drupal_provision_install_validate() {
if (!d()->uri) {
return drush_set_error("PROVISION_URL_REQUIRED", dt("You need to specify a valid url to install a site"));
}
if (_provision_drupal_site_exists()) {
if (drush_bootstrap_max() == DRUSH_BOOTSTRAP_DRUPAL_LOGIN) {
return drush_set_error('PROVISION_SITE_INSTALLED', dt('This site has already been installed.'));
}
}
......
......@@ -71,17 +71,6 @@ function provision_drupal_drush_exit() {
}
}
/**
* Test to see if the site is fully installed by attempting to bootstrap drupal
* all the way to a Drupal Login. This only happens if a site is truly installed.
*
* @return
* If the file exists, return TRUE, else return FALSE.
*/
function _provision_drupal_site_exists() {
return drush_bootstrap_max() == DRUSH_BOOTSTRAP_DRUPAL_LOGIN;
}
/**
* This command does the actual installation in it's own thread,
* so we can recover gracefully if things go really wrong.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment