Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(694)

Unified Diff: packages/package_config/lib/discovery.dart

Issue 3015713002: Roll to pickup pool changes
Patch Set: Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « packages/package_config/CHANGELOG.md ('k') | packages/package_config/lib/discovery_analysis.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/package_config/lib/discovery.dart
diff --git a/packages/package_config/lib/discovery.dart b/packages/package_config/lib/discovery.dart
index 4c09eecfbabcde5ca56b1a1e086bbb7f4dbdc1dc..020d99a801f2a1763124d13627ae290ac0fe1274 100644
--- a/packages/package_config/lib/discovery.dart
+++ b/packages/package_config/lib/discovery.dart
@@ -33,6 +33,7 @@ Future<Packages> loadPackagesFile(Uri packagesFile,
Map<String, Uri> packageMap = pkgfile.parse(bytes, packagesFile);
return new MapPackages(packageMap);
}
+
if (packagesFile.scheme == "file") {
File file = new File.fromUri(packagesFile);
return parseBytes(await file.readAsBytes());
@@ -125,6 +126,7 @@ FileSystemEntity _findPackagesFile(String workingDirectory) {
if (file.existsSync()) return file;
return null;
}
+
// Check for $cwd/.packages
var packagesCfgFile = checkForConfigFile(dir);
if (packagesCfgFile != null) return packagesCfgFile;
@@ -210,8 +212,8 @@ Future<List<int>> _httpGet(Uri uri) async {
HttpClientRequest request = await client.getUrl(uri);
HttpClientResponse response = await request.close();
if (response.statusCode != HttpStatus.OK) {
- throw 'Failure getting $uri: '
- '${response.statusCode} ${response.reasonPhrase}';
+ throw new HttpException('${response.statusCode} ${response.reasonPhrase}',
+ uri: uri);
}
List<List<int>> splitContent = await response.toList();
int totalLength = 0;
« no previous file with comments | « packages/package_config/CHANGELOG.md ('k') | packages/package_config/lib/discovery_analysis.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698