Skip to content
Snippets Groups Projects
Commit af4ee9e9 authored by Jon Pugh's avatar Jon Pugh
Browse files

Remove redundant calls to create files. sites/X/files folders were being...

Remove redundant calls to create files. sites/X/files folders were being created before the git docroot is added.
parent 686e997c
No related branches found
Tags 7.x-4.0-beta4
No related merge requests found
......@@ -65,7 +65,7 @@ function drush_provision_drupal_provision_install_validate() {
*/
function drush_provision_drupal_pre_provision_install() {
// This is the actual drupal provisioning requirements.
_provision_drupal_create_directories();
// _provision_drupal_create_directories();
}
/**
......@@ -89,11 +89,12 @@ function drush_provision_drupal_pre_provision_install_rollback() {
*/
function drush_provision_drupal_provision_install() {
// Requires at least the database settings to complete.
// _provision_drupal_create_directories();
provision_prepare_environment();
_provision_drupal_create_settings_file();
provision_drupal_push_site($override_slave_authority = TRUE);
provision_save_site_data();
// provision_save_site_data();
drush_bootstrap(DRUSH_BOOTSTRAP_DRUPAL_SITE);
......
......@@ -58,7 +58,7 @@ function provision_drupal_drush_exit() {
if (drush_get_option('installed')) {
// Don't generate the drushrc.php on provision-save/delete commands.
if (!preg_match("/^provision-(save|delete)/", $command[0])) {
provision_save_site_data();
// provision_save_site_data();
}
}
}
......@@ -654,7 +654,7 @@ function _provision_drupal_find_modules($scope, $key = '') {
foreach ($paths as $path) {
$files = array_merge($files, drush_scan_directory($path, "/\.module$/", array('.', '..', 'CVS', '.svn'), 0, TRUE, 'name'));
}
}
}
foreach ($files as $name => $info) {
if (drush_drupal_major_version() >= 8) {
......
......@@ -531,14 +531,14 @@ function drush_provision_drupal_pre_provision_verify() {
drush_set_option('git_docroot', d()->git_docroot, 'drupal');
// This is the actual drupal provisioning requirements.
_provision_drupal_create_directories();
//_provision_drupal_create_directories();
_provision_drupal_maintain_aliases();
// @TODO: Move to post-hosting-task.
// _provision_drupal_ensure_htaccess_update();
// Requires at least the database settings to complete.
_provision_drupal_create_settings_file();
//_provision_drupal_create_settings_file();
// If this is the hostmaster site, save the ~/.drush/drushrc.php file.
$hostmaster = provision_sitealias_get_record('@hostmaster');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment