summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-02-25 02:36:06 +0000
committerPaul Phillips <paulp@improving.org>2010-02-25 02:36:06 +0000
commit8a36e97b1097cd1fd610979382cf2374b26387dc (patch)
treed66dd9d19ccec59afe690bf4fafb9d3d853d76a1 /src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
parent2bf3a560d6b9c5c187f1b04e1cd687d7a3604bb7 (diff)
downloadscala-8a36e97b1097cd1fd610979382cf2374b26387dc.tar.gz
scala-8a36e97b1097cd1fd610979382cf2374b26387dc.tar.bz2
scala-8a36e97b1097cd1fd610979382cf2374b26387dc.zip
Fix for a king-sized last-minute thinko.
Diffstat (limited to 'src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala')
-rw-r--r--src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index 76daa0d2fe..ce10f560e9 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -28,7 +28,9 @@ abstract class AbstractReporter extends Reporter {
def displayPrompt: Unit
protected def info0(pos: Position, msg: String, _severity: Severity, force: Boolean) {
- val severity = if (settings.Ywarnfatal.value) ERROR else WARNING
+ val severity =
+ if (settings.Ywarnfatal.value && _severity == WARNING) ERROR
+ else _severity
severity match {
case INFO =>