Home

Fix for Code

September 3, 2010 - 12:02am — Anonymous
  1. ? drush_interactive.patch
  2. ? includes/table.inc
  3. Index: includes/drush.inc
  4. ===================================================================
  5. RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
  6. retrieving revision 1.135
  7. diff -u -p -r1.135 drush.inc
  8. --- includes/drush.inc  29 Aug 2010 12:57:27 -0000      1.135
  9. +++ includes/drush.inc  3 Sep 2010 04:00:53 -0000
  10. @@ -769,8 +769,29 @@ function drush_shell_cd_and_exec($effect
  11.   *   0 if success.
  12.   */
  13.  function drush_shell_exec($cmd) {
  14. -  $args = func_get_args();
  15. +  return _drush_shell_exec(func_get_args());
  16. +}
  17. +
  18. +/**
  19. + * Executes a command in interactive mode.
  20. + *
  21. + * @see drush_shell_exec.
  22. + */
  23. +function drush_shell_exec($cmd) {
  24. +  return _drush_shell_exec(func_get_args(), TRUE);
  25. +}
  26.  
  27. +/**
  28. + * Internal function: executes a shell command:
  29. + *
  30. + * @param $args
  31. + *   The command and its arguments.
  32. + * @param $interactive
  33. + *   Whether to run in
  34. + *
  35. + * @see drush_shell_exec.
  36. + */
  37. +function _drush_shell_exec($args, $interactive = FALSE) {
  38.    //do not change the command itself, just the parameters.
  39.    for ($x = 1; $x < sizeof($args); $x++) {
  40.      $args[$x] = escapeshellarg($args[$x]);
  41. @@ -782,7 +803,7 @@ function drush_shell_exec($cmd) {
  42.    }
  43.  
  44.    if (!drush_get_context('DRUSH_SIMULATE')) {
  45. -    exec($command . ' 2>&1', $output, $result);
  46. +    exec($command . ($interactive ? ' 2>&1' : ''), $output, $result);
  47.      _drush_shell_exec_output_set($output);
  48.  
  49.      if (drush_get_context('DRUSH_DEBUG')) {

Submit Fix

Any tags you'd like to associate with your code, delimitered by commas (example: Views, CCK, Module, etc).
Select the syntax highlighting mode to use.