Do not pass local paths to remote hosts (#3658)

* Do not pass local paths to remote hosts

Author: greg-1-anderson

includes/backend.inc

@@ -745,11 +745,15 @@ function drush_backend_invoke_concurrent($invocations, $common_options = [], $co
     // Add in command-specific options as well
     // $command_options += drush_command_get_command_specific_options($site_record, $command);
 
+    $is_remote = array_key_exists('remote-host', $site_record);
+
     // Add in preflight option contexts (--include et. al)
-    $preflightContextOptions =
-      \Drush\Drush::config()->get(PreflightArgs::DRUSH_RUNTIME_CONTEXT_NAMESPACE, []) +
-      \Drush\Drush::config()->get(PreflightArgs::DRUSH_CONFIG_PATH_NAMESPACE, []);
+    $preflightContextOptions = \Drush\Drush::config()->get(PreflightArgs::DRUSH_RUNTIME_CONTEXT_NAMESPACE, []);
     $preflightContextOptions['local'] = \Drush\Drush::config()->get('runtime.local', false);
+    // If the command is local, also include the paths context.
+    if (!$is_remote) {
+      $preflightContextOptions += \Drush\Drush::config()->get(PreflightArgs::DRUSH_CONFIG_PATH_NAMESPACE, []);
+    }
     foreach ($preflightContextOptions as $key => $value) {
       if ($value) {
         $command_options[$key] = $value;

tests/BackendTest.php

@@ -41,7 +41,7 @@ public function testDispatchUsingAlias()
         $output = preg_replace('#  *#', ' ', $output);
         $output = preg_replace('# -t #', ' ', $output); // volkswagon away the -t, it's not relevant to what we're testing here
         $output = preg_replace('#' . self::getSandbox() . '#', '__SANDBOX__', $output);
-        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=no [email protected] '/usr/local/bin/drush --alias-path=__SANDBOX__/etc/drush/sites --root=/path/to/drupal --uri=http://example.com --no-interaction status", $output);
+        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=no [email protected] '/usr/local/bin/drush --root=/path/to/drupal --uri=http://example.com --no-interaction status", $output);
     }
 
     /**

tests/SqlSyncTest.php

@@ -45,7 +45,7 @@ public function testSimulatedSqlSync()
         // Test simulated simple rsync remote-to-local
         $this->drush('sql:sync', ['@synctest.remote', '@synctest.local'], $options, '@synctest.local', null, self::EXIT_SUCCESS, '2>&1');
         $output = $this->getSimplifiedOutput();
-        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=whatever [email protected] '/path/to/drush --backend=2 --strict=0 $expectedAliasPath --root=__SUT__/web --uri=remote sql-dump --no-interaction --gzip --result-file", $output);
+        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=whatever [email protected] '/path/to/drush --backend=2 --strict=0 --root=__SUT__/web --uri=remote sql-dump --no-interaction --gzip --result-file", $output);
         $this->assertContains("Simulating backend invoke: __SUT__/vendor/drush/drush/drush --backend=2 $expectedAliasPath --root=__SUT__/web --uri=local core-rsync '@synctest.remote:/simulated/path/to/dump.tgz' '@synctest.local:__SANDBOX__/tmp/dump.tgz' -- --remove-source-files", $output);
         $this->assertContains("Simulating backend invoke: __SUT__/vendor/drush/drush/drush --backend=2 --strict=0 $expectedAliasPath --root=__SUT__/web --uri=local sql-query --no-interaction --file=__SANDBOX__/tmp/dump.tgz --file-delete", $output);
 
@@ -54,7 +54,7 @@ public function testSimulatedSqlSync()
         $output = $this->getSimplifiedOutput();
         $this->assertContains("Simulating backend invoke: __SUT__/vendor/drush/drush/drush --backend=2 --strict=0 $expectedAliasPath --root=__SUT__/web --uri=local sql-dump --no-interaction --gzip --result-file", $output);
         $this->assertContains("Simulating backend invoke: __SUT__/vendor/drush/drush/drush --backend=2 $expectedAliasPath --root=__SUT__/web --uri=local core-rsync '@synctest.local:/simulated/path/to/dump.tgz' '@synctest.remote:/tmp/dump.tgz' -- --remove-source-files", $output);
-        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=whatever [email protected] '/path/to/drush --backend=2 --strict=0 $expectedAliasPath --root=__SUT__/web --uri=remote sql-query --no-interaction --file=/tmp/dump.tgz --file-delete", $output);
+        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=whatever [email protected] '/path/to/drush --backend=2 --strict=0 --root=__SUT__/web --uri=remote sql-query --no-interaction --file=/tmp/dump.tgz --file-delete", $output);
 
 
         // Test simulated backend invoke with a remote runner.
@@ -63,7 +63,7 @@ public function testSimulatedSqlSync()
         // they are used with drush_invoke_process.
         $this->drush('sql:sync', ['@synctest.remote', '@synctest.local'], $options, 'user@server/path/to/drupal#sitename', null, self::EXIT_SUCCESS, '2>&1');
         $output = $this->getSimplifiedOutput();
-        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=no user@server 'drush $expectedAliasPath --root=/path/to/drupal --uri=sitename --no-interaction sql:sync '\''@synctest.remote'\'' '\''@synctest.local'\''", $output);
+        $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=no user@server 'drush --root=/path/to/drupal --uri=sitename --no-interaction sql:sync '\''@synctest.remote'\'' '\''@synctest.local'\''", $output);
     }
 
     /**