dart2js: don't add a trailing slash when reading --packages

harryterkelsen · whesse · commit 7f789484c8c5 · 2015-08-20T15:12:39.000+02:00
BUG= R=sigmund@google.com Review URL: https://codereview.chromium.org//1290903002.
diff --git a/pkg/compiler/lib/src/dart2js.dart b/pkg/compiler/lib/src/dart2js.dart
@@ -66,9 +66,9 @@ String extractParameter(String argument, {bool isOptionalArgument: false}) {
   return m[2];
 }
 
-String extractPath(String argument) {
+String extractPath(String argument, {bool isDirectory: true}) {
   String path = nativeToUriPath(extractParameter(argument));
-  return path.endsWith("/") ? path : "$path/";
+  return !path.endsWith("/") && isDirectory ? "$path/" : path;
 }
 
 void parseCommandLine(List<OptionHandler> handlers, List<String> argv) {
@@ -143,7 +143,8 @@ Future<api.CompilationResult> compile(List<String> argv) {
   }
 
   setPackageConfig(String argument) {
-    packageConfig = currentDirectory.resolve(extractPath(argument));
+    packageConfig =
+        currentDirectory.resolve(extractPath(argument, isDirectory: false));
   }
 
   setOutput(Iterator<String> arguments) {

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ String extractParameter(String argument, {bool isOptionalArgument: false}) {`
`66`	`66`	`return m[2];`
`67`	`67`	`}`
`68`	`68`
`69`		`-String extractPath(String argument) {`
	`69`	`+String extractPath(String argument, {bool isDirectory: true}) {`
`70`	`70`	`String path = nativeToUriPath(extractParameter(argument));`
`71`		`- return path.endsWith("/") ? path : "$path/";`
	`71`	`+ return !path.endsWith("/") && isDirectory ? "$path/" : path;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void parseCommandLine(List<OptionHandler> handlers, List<String> argv) {`
`@@ -143,7 +143,8 @@ Future<api.CompilationResult> compile(List<String> argv) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`setPackageConfig(String argument) {`
`146`		`- packageConfig = currentDirectory.resolve(extractPath(argument));`
	`146`	`+ packageConfig =`
	`147`	`+ currentDirectory.resolve(extractPath(argument, isDirectory: false));`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`setOutput(Iterator<String> arguments) {`