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

Unified Diff: utils/pub/entrypoint.dart

Issue 12211061: Handle circular dependencies on the root package when checking SDK constraints. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 10 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 | « no previous file | utils/pub/system_cache.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/pub/entrypoint.dart
diff --git a/utils/pub/entrypoint.dart b/utils/pub/entrypoint.dart
index 843d41d2a753d59dc632049c85517488580566e6..6d7ffe09f860f63b5713e3958d8f8ea601fb71bb 100644
--- a/utils/pub/entrypoint.dart
+++ b/utils/pub/entrypoint.dart
@@ -157,13 +157,19 @@ class Entrypoint {
var id = lockFile.packages[ref.name];
visited.add(ref.name);
- var future = cache.describe(id);
+ var future;
+ if (ref.name == root.name) {
+ future = new Future<Pubspec>.immediate(root.pubspec);
+ } else {
+ future = cache.describe(id);
+ }
group.add(future.then(visitPackage));
}
return pubspec;
}
+ visited.add(root.name);
visitPackage(root.pubspec);
return group.future;
});
« no previous file with comments | « no previous file | utils/pub/system_cache.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698