Merge branch 'master' into 27610_8.3_fixes

davidgrayston · davidgrayston · commit 93f01fbf9d99 · 2017-03-21T17:14:02.000Z
diff --git a/src/Command/SiteDbImportCommand.php b/src/Command/SiteDbImportCommand.php
@@ -176,7 +176,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 
             // Copy file to /tmp.
             $command .= sprintf(
-              'cp %s /tmp; ',
+              'cp -L %s /tmp; ',
               $this->filename
             );
           }

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {`
`176`	`176`
`177`	`177`	`// Copy file to /tmp.`
`178`	`178`	`$command .= sprintf(`
`179`		`- 'cp %s /tmp; ',`
	`179`	`+ 'cp -L %s /tmp; ',`
`180`	`180`	`$this->filename`
`181`	`181`	`);`
`182`	`182`	`}`