Stop working around issue 6764.

utils/pub/io.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Helper functionality to make working with IO easier.
 library io;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 148 matching lines @@
     var lister = new Directory(dir).list();
 
     var children = [];
     lister.listen(
         (entity) {
           if (entity is File) {
             var file = entity.path;
             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) {
               children.add(doList(file, listedDirectories));
             }
           }
         },
         onDone: () {
           // TODO(rnystrom): May need to sort here if it turns out
           // onDir and onFile aren't guaranteed to be called in a
@@ skipping 580 matching lines @@
   const PubProcessResult(this.stdout, this.stderr, this.exitCode);
 
   bool get success => exitCode == 0;
 }
 
 /// Gets a [Uri] for [uri], which can either already be one, or be a [String].
 Uri _getUri(uri) {
   if (uri is Uri) return uri;
   return Uri.parse(uri);
 }