OLD | NEW |
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library path_source; | 5 library path_source; |
6 | 6 |
7 import 'dart:async'; | 7 import 'dart:async'; |
8 import 'dart:io'; | 8 import 'dart:io'; |
9 | 9 |
10 import '../../pkg/pathos/lib/path.dart' as path; | 10 import '../../pkg/pathos/lib/path.dart' as path; |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 "relative": isRelative | 99 "relative": isRelative |
100 }; | 100 }; |
101 } | 101 } |
102 | 102 |
103 /// Ensures that [description] is a valid path description. It must be a map, | 103 /// Ensures that [description] is a valid path description. It must be a map, |
104 /// with a "path" key containing a path that points to an existing directory. | 104 /// with a "path" key containing a path that points to an existing directory. |
105 /// Throws a [FormatException] if the path is invalid. | 105 /// Throws a [FormatException] if the path is invalid. |
106 void _validatePath(String name, description) { | 106 void _validatePath(String name, description) { |
107 var dir = description["path"]; | 107 var dir = description["path"]; |
108 | 108 |
| 109 if (dirExists(dir)) return; |
| 110 |
| 111 // Check this after dirExists() so that symlinks to directories don't get |
| 112 // confused as files. |
109 if (fileExists(dir)) { | 113 if (fileExists(dir)) { |
110 throw new FormatException( | 114 throw new FormatException( |
111 "Path dependency for package '$name' must refer to a " | 115 "Path dependency for package '$name' must refer to a " |
112 "directory, not a file. Was '$dir'."); | 116 "directory, not a file. Was '$dir'."); |
113 } | 117 } |
114 | 118 |
115 if (!dirExists(dir)) { | 119 throw new FormatException("Could not find package '$name' at '$dir'."); |
116 throw new FormatException("Could not find package '$name' at '$dir'."); | |
117 } | |
118 } | 120 } |
119 } | 121 } |
OLD | NEW |