Development

Changeset 10503

You must first sign up to be able to contribute.

Changeset 10503

Show
Ignore:
Timestamp:
07/29/08 19:42:22 (5 months ago)
Author:
dwhittle
Message:

dwhittle: merged r10501 + r10502

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/dwhittle/1.1/lib/task/project/sfProjectDeployTask.class.php

    r10475 r10503  
    3131      new sfCommandOption('go', null, sfCommandOption::PARAMETER_NONE, 'Do the deployment'), 
    3232      new sfCommandOption('rsync-dir', null, sfCommandOption::PARAMETER_REQUIRED, 'The directory where to look for rsync*.txt files', 'config'), 
    33       new sfCommandOption('rsync-options', null, sfCommandOption::PARAMETER_OPTIONAL, 'To options to pass to the rsync executable', 'azC'), 
    3433    )); 
    3534 
     
    7675 
    7776  [./symfony project:deploy --go --rsync-dir=config/production production|INFO] 
    78  
    79 Last, you can specify the options passed to the rsync executable, using the  
    80 [rsync-options|INFO] option (defaults are [-azC|INFO]): 
    81  
    82   [./symfony project:deploy --go --rsync-options=avz|INFO] 
    8377EOF; 
    8478  } 
     
    141135    else 
    142136    { 
    143       $parameters = sprintf('-%s --force --delete', $options['rsync-options'])
     137      $parameters = '-azC --force --delete'
    144138      if (file_exists($options['rsync-dir'].'/rsync_exclude.txt')) 
    145139      { 
  • branches/dwhittle/1.2/lib/task/project/sfProjectDeployTask.class.php

    r10475 r10503  
    3131      new sfCommandOption('go', null, sfCommandOption::PARAMETER_NONE, 'Do the deployment'), 
    3232      new sfCommandOption('rsync-dir', null, sfCommandOption::PARAMETER_REQUIRED, 'The directory where to look for rsync*.txt files', 'config'), 
    33       new sfCommandOption('rsync-options', null, sfCommandOption::PARAMETER_OPTIONAL, 'To options to pass to the rsync executable', 'azC'), 
     33      new sfCommandOption('rsync-options', null, sfCommandOption::PARAMETER_OPTIONAL, 'To options to pass to the rsync executable', 'azC --force --delete'), 
    3434    )); 
    3535 
     
    139139    else 
    140140    { 
    141       $parameters = sprintf('-%s --force --delete', $options['rsync-options'])
     141      $parameters = $options['rsync-options']
    142142      if (file_exists($options['rsync-dir'].'/rsync_exclude.txt')) 
    143143      {