Commit c33e5bec authored by toaster's avatar toaster
Browse files

added / addition

git-svn-id: https://subversion.umiacs.umd.edu/ace/trunk@128 f1b3a171-7291-4a19-a512-95ad0ad9394a
parent 4373d0c7
......@@ -98,7 +98,7 @@ public final class CollectionCompare2 {
cr.fileExistsAtTarget(acePath);
if (sourceMap.get(acePath).matches(aceDigest)) {
//Perfect file,
//Perfect file, no-op
} else {
cr.mismatchedDigests(acePath, sourceMap.get(acePath), aceDigest);
}
......@@ -126,6 +126,7 @@ public final class CollectionCompare2 {
BufferedReader input = new BufferedReader(new InputStreamReader(sourceFile));
String line = input.readLine();
// ignore ace manifest header
if (line != null && line.matches("^[A-Z0-9\\-]+:.+$")) {
line = input.readLine();
}
......@@ -136,8 +137,12 @@ public final class CollectionCompare2 {
LOG.error("Error processing line: " + line);
parseErrors.add("Corrupt Line: " + line);
} else {
sourceMap.put(tokens[1], tokens[0]);
sourceReverseMap.put(tokens[0], tokens[1]);
String path = tokens[1];
// temp hack to make sure all paths start w/ / as ace expectes
if (!path.startsWith("/"))
path = "/" + path;
sourceMap.put(path, tokens[0]);
sourceReverseMap.put(tokens[0], path);
}
line = input.readLine();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment