Commit 7301bb9a authored by Jon Pugh's avatar Jon Pugh

Merge branch '2666158-dont-backup-missing-site' into 7.x-3.x

parents 0dc24e83 05ffe3b0
......@@ -9,10 +9,15 @@ function drush_provision_drupal_pre_provision_delete($backup_file = NULL) {
if (!empty($backup_file) && !strpos($backup_file, '/')) {
drush_set_error('PROVISION_DELETE_BACKUP_NAME_RELATIVE', dt('The passed backup name is a relative path, storing that in the site directory which is going to be deleted is probably not intended. Try an absolute name, or no name to let one be generated.'));
}
else {
// If site database exists and is boostrapped, run a backup.
elseif (drush_bootstrap_max() == DRUSH_BOOTSTRAP_DRUPAL_LOGIN) {
drush_log(dt('Invoking drush provision-backup...'));
drush_invoke("provision-backup", $backup_file);
drush_unset_option('force', 'process');
}
else {
drush_log(dt('Warning: A site backup was not made because a site database was not found.'), 'warning');
}
}
}
......
......@@ -109,7 +109,7 @@ function provision_drupal_push_site($override_slave_authority = FALSE) {
// Sync the platform
$sync_path = d()->root;
drush_command_invoke_all_ref('provision_platform_sync_path_alter', $sync_path, d());
drush_command_invoke_all_ref('provision_platform_sync_path_alter', $sync_path);
d()->service('http')->sync($sync_path, array('exclude-sites' => TRUE));
if (d()->type === 'site') {
......
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