summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-03-29 18:49:03 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-03-29 18:49:03 +0000
commit55eb30f54c0ff78ddb8c574ddd8a0d0a94c29ed8 (patch)
treebfd01e22635ae62923ae3f0095f090491e484ded /src/compiler
parent75ea6c9f2a9e88bcf5cb87aefb951fba18f24440 (diff)
downloadscala-55eb30f54c0ff78ddb8c574ddd8a0d0a94c29ed8.tar.gz
scala-55eb30f54c0ff78ddb8c574ddd8a0d0a94c29ed8.tar.bz2
scala-55eb30f54c0ff78ddb8c574ddd8a0d0a94c29ed8.zip
Reverted Sean's change.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/io/ZipArchive.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
index 4c9564f319..97a8e0d5ec 100644
--- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala
+++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala
@@ -125,8 +125,7 @@ final class ZipArchive(file: File, val archive: ZipFile) extends PlainFile(file)
val name = if (index < 0) path else path.substring(index + 1)
val home = if (index < 0) "/" else path.substring(0, index + 1)
val parent: DirEntry = getDir(dirs, home)
- if (!parent.entries.contains(name))
- Console.println("XXX: " + this.toString() + " - " + home + "/" + name)
+ assert(!parent.entries.contains(path), this.toString() + " - " + path)
parent.entries.update(name, new FileEntry(parent, name, path, entry))
}
}