dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a0b088d
)
Merge "shell: Deduplicate code in Command.php by combining else paths"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Thu, 12 Oct 2017 20:53:18 +0000
(20:53 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Thu, 12 Oct 2017 20:53:18 +0000
(20:53 +0000)
includes/shell/Command.php
patch
|
blob
|
history
diff --git
a/includes/shell/Command.php
b/includes/shell/Command.php
index
fb2d787
..
d5a1bb3
100644
(file)
--- a/
includes/shell/Command.php
+++ b/
includes/shell/Command.php
@@
-245,10
+245,9
@@
class Command {
"MW_USE_LOG_PIPE=yes"
);
$useLogPipe = true;
- } elseif ( $this->useStderr ) {
- $cmd .= ' 2>&1';
}
- } elseif ( $this->useStderr ) {
+ }
+ if ( !$useLogPipe && $this->useStderr ) {
$cmd .= ' 2>&1';
}
wfDebug( __METHOD__ . ": $cmd\n" );
@@
-259,7
+258,7
@@
class Command {
// input. See T129506.
if ( strlen( $cmd ) > SHELL_MAX_ARG_STRLEN ) {
throw new Exception( __METHOD__ .
-
'(): total length of $cmd must not exceed SHELL_MAX_ARG_STRLEN' );
+ '(): total length of $cmd must not exceed SHELL_MAX_ARG_STRLEN' );
}
$desc = [