diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-03-30 03:19:39 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2008-03-30 03:19:39 +0000 |
| commit | b59e5237c1c93c60e5ac68711b41625ace560a4f (patch) | |
| tree | 5b69c0d476ce9fd8e754ff5cb366af3b11c13844 /src/compiler | |
| parent | 55eb30f54c0ff78ddb8c574ddd8a0d0a94c29ed8 (diff) | |
| download | scala-b59e5237c1c93c60e5ac68711b41625ace560a4f.tar.gz scala-b59e5237c1c93c60e5ac68711b41625ace560a4f.tar.bz2 scala-b59e5237c1c93c60e5ac68711b41625ace560a4f.zip | |
Re-commented the assert out, it should probably be
assert(!parent.entries.contains(name)), I got the
boolean logic wrong on the last commit.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/io/ZipArchive.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/io/ZipArchive.scala b/src/compiler/scala/tools/nsc/io/ZipArchive.scala index 97a8e0d5ec..3267163363 100644 --- a/src/compiler/scala/tools/nsc/io/ZipArchive.scala +++ b/src/compiler/scala/tools/nsc/io/ZipArchive.scala @@ -125,7 +125,10 @@ 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) - assert(!parent.entries.contains(path), this.toString() + " - " + path) + // OLD: assert(!parent.entries.contains(path)) + // MAYBE: assert(!parent.entries.contains(name)) + //if (parent.entries.contains(name)) + // Console.println("XXX: " + this.toString() + " - " + home + "/" + name) parent.entries.update(name, new FileEntry(parent, name, path, entry)) } } |