? cleaner_error_reporting.patch ? silence.patch ? whee.patch Index: db_server/provision_mysql.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/db_server/provision_mysql.drush.inc,v retrieving revision 1.13 diff -u -u -r1.13 provision_mysql.drush.inc --- db_server/provision_mysql.drush.inc 7 May 2009 18:22:48 -0000 1.13 +++ db_server/provision_mysql.drush.inc 11 May 2009 18:56:45 -0000 @@ -74,6 +74,8 @@ if (!_provision_mysql_drop_database($db_name)) { drush_log(dt("Failed to drop database @dbname", array('@dbname' => $db_name)), 'warning'); } + } else { + drush_log(dt("Database @dbname missing when trying to destroy, skipping.", array('@dbname' => $db_name))); } if ( _provision_mysql_database_exists($db_name) ) { Index: platform/backup.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/backup.provision.inc,v retrieving revision 1.10 diff -u -u -r1.10 backup.provision.inc --- platform/backup.provision.inc 7 May 2009 22:04:30 -0000 1.10 +++ platform/backup.provision.inc 11 May 2009 18:56:45 -0000 @@ -51,7 +51,7 @@ drush_log(dt("Adding sites directory to !backup_file", array('!backup_file' => $backup_file)), 'backup'); $result = provision_shell_exec("cd %s; tar -rf %s * ", drush_get_option('sites_path') . "/$url", $backup_file); - if (!$result) { + if (!$result && !drush_get_option('force')) { drush_set_error('PROVISION_BACKUP_FAILED', dt("Could not back up sites directory for drupal")); } } Index: platform/delete.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/delete.provision.inc,v retrieving revision 1.7 diff -u -u -r1.7 delete.provision.inc --- platform/delete.provision.inc 9 May 2009 18:20:51 -0000 1.7 +++ platform/delete.provision.inc 11 May 2009 18:56:45 -0000 @@ -10,7 +10,10 @@ * Before starting to delete the site, make a backup */ function drush_provision_drupal_pre_provision_delete($url, $backup_file = NULL) { - drush_invoke('provision backup', $url, $backup_file); + $force = drush_get_option('force', false); + drush_set_option('force', true); + drush_invoke("provision backup", $url, $backup_file); + drush_set_option('force', $force); } /** Index: platform/disable.provision.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/platform/disable.provision.inc,v retrieving revision 1.6 diff -u -u -r1.6 disable.provision.inc --- platform/disable.provision.inc 7 May 2009 22:04:30 -0000 1.6 +++ platform/disable.provision.inc 11 May 2009 18:56:45 -0000 @@ -23,7 +23,10 @@ * Make a backup of the site before we mess with it */ function drush_provision_drupal_pre_provision_disable($url, $backup_file = null) { + $force = drush_get_option('force', false); + drush_set_option('force', true); drush_invoke("provision backup", $url, $backup_file); + drush_set_option('force', $force); } /** Index: web_server/provision_apache.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/provision/web_server/provision_apache.drush.inc,v retrieving revision 1.14 diff -u -u -r1.14 provision_apache.drush.inc --- web_server/provision_apache.drush.inc 16 Apr 2009 23:58:26 -0000 1.14 +++ web_server/provision_apache.drush.inc 11 May 2009 18:56:45 -0000 @@ -118,10 +118,10 @@ $return = drush_shell_exec(escapeshellcmd(drush_get_option('restart_cmd'))); if (!$return) { if ($cause_error) { - return drush_set_error('PROVISION_WEB_RESTART_FAILED', dt("Web server could not be restarted. Changes might not be available until this has been done.")); + return drush_set_error('PROVISION_WEB_RESTART_FAILED', dt("Web server could not be restarted. Changes might not be available until this has been done. Output: %output", array('%output' => drush_shell_exec_output()))); } else { - drush_log(dt("Web server could not be restarted. Changes might not be available until this has been done."), "warning"); + drush_log(dt("Web server could not be restarted. Changes might not be available until this has been done Output: %output", array('%output' => drush_shell_exec_output())), "warning"); } } else {