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

Unified Diff: utils/pub/io.dart

Issue 12902031: Stop working around issue 6764. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: . Created 7 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/pub/io.dart
diff --git a/utils/pub/io.dart b/utils/pub/io.dart
index 5694abb8c1e87f3af7f5697291734930db905fce..1d2f92ff0909fa1bf300caf753e6d58314fbfe89 100644
--- a/utils/pub/io.dart
+++ b/utils/pub/io.dart
@@ -166,15 +166,14 @@ Future<List<String>> listDir(String dir,
if (!includeHiddenFiles && path.basename(file).startsWith('.')) {
return;
}
- contents.add(path.join(dir, path.basename(file)));
+ contents.add(file);
} else if (entity is Directory) {
var file = entity.path;
if (!includeHiddenFiles && path.basename(file).startsWith('.')) {
return;
}
- file = path.join(dir, path.basename(file));
contents.add(file);
- // TODO(nweiz): don't manually recurse once issue 7358 is fixed.
+ // TODO(nweiz): don't manually recurse once issue 4794 is fixed.
// Note that once we remove the manual recursion, we'll need to
// explicitly filter out files in hidden directories.
if (recursive) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698