summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Jacq2011-01-18 12:17:03 (GMT)
committermig52011-01-18 12:17:03 (GMT)
commitad0ca56a3ad58b013df8ece2f25da484665ae3b4 (patch)
tree81cb889edc87d16ef7b48334ae974df4fda43947
parent59bb39710b39e89dbcf7011ac920f63ca43d0bf6 (diff)
Do not send delete = TRUE to the drush rsync call even if no-delete
isset. Send it only if no-delete is not set. This still leaves delete = TRUE as the default, unless no-delete has been set to TRUE. This solves critical bug #976300. I can't imagine a case where someone would want to set no-delete = FALSE if --delete is the default at all other times, but I added a condition to account for this too.
-rw-r--r--provision.context.server.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/provision.context.server.inc b/provision.context.server.inc
index db7971d..f9764e9 100644
--- a/provision.context.server.inc
+++ b/provision.context.server.inc
@@ -173,14 +173,13 @@ class provisionContext_server extends provisionContext {
'relative' => TRUE,
'keep-dirlinks' => TRUE,
'omit-dir-times' => TRUE,
- 'delete' => TRUE,
), $additional_options);
// We need to do this due to how drush creates the rsync command.
// If the option is present at all , even if false or null, it will
// add it to the command.
- if (!isset($additional_options['no-delete'])) {
+ if (!isset($additional_options['no-delete']) || $additional_options['no-delete'] == FALSE ) {
$options['delete'] = TRUE;
}