summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-08-23 11:19:51 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-08-23 11:19:51 -0700
commit7a20b031d48d653291a3ebfb74bfff454c701e7a (patch)
tree063bca707ac6b29b22b8527b618b33b746c14fd5 /src
parentcc1ce4ee4ca316994ab4ffa30552f302c23df82e (diff)
parent20be88dfbcd09541f48f0800636f487dece4eeaa (diff)
downloadscala-7a20b031d48d653291a3ebfb74bfff454c701e7a.tar.gz
scala-7a20b031d48d653291a3ebfb74bfff454c701e7a.tar.bz2
scala-7a20b031d48d653291a3ebfb74bfff454c701e7a.zip
Merge pull request #2858 from Debilski/docstring-fix
ProcessBuilder.lines(log) *does* throw an exception.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/sys/process/ProcessBuilder.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library/scala/sys/process/ProcessBuilder.scala b/src/library/scala/sys/process/ProcessBuilder.scala
index adf5a4f6b2..a144d51609 100644
--- a/src/library/scala/sys/process/ProcessBuilder.scala
+++ b/src/library/scala/sys/process/ProcessBuilder.scala
@@ -171,7 +171,7 @@ trait ProcessBuilder extends Source with Sink {
* a Stream that blocks when lines are not available but the process has not
* completed. Standard error is sent to the provided ProcessLogger. If the
* process exits with a non-zero value, the Stream will provide all lines up
- * to termination but will not throw an exception.
+ * to termination and then throw an exception.
*/
def lines(log: ProcessLogger): Stream[String]