Provisionally stop working around issues 9252 and 9253.

utils/pub/entrypoint.dart

 // Copyright (c) 2012, 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.
 
 library entrypoint;
 
 import 'dart:async';
 
 import '../../pkg/pathos/lib/path.dart' as path;
 
@@ skipping 55 matching lines @@
   /// `id.source.shouldCache` is true).
   ///
   /// See also [installDependencies].
   Future<PackageId> install(PackageId id) {
     var pendingOrCompleted = _installs[id];
     if (pendingOrCompleted != null) return pendingOrCompleted;
 
     var packageDir = path.join(packagesDir, id.name);
     var future = defer(() {
       ensureDir(path.dirname(packageDir));
-      if (!dirExists(packageDir)) return;
 
-      // TODO(nweiz): figure out when to actually delete the directory, and when
-      // we can just re-use the existing symlink.
-      log.fine("Deleting package directory for ${id.name} before install.");
-      return deleteDir(packageDir);
-    }).then((_) {
+      if (dirExists(packageDir)) {
+        // TODO(nweiz): figure out when to actually delete the directory, and
+        // when we can just re-use the existing symlink.
+        log.fine("Deleting package directory for ${id.name} before install.");
+        deleteDir(packageDir);
+      }
+
       if (id.source.shouldCache) {
         return cache.install(id).then(
             (pkg) => createPackageSymlink(id.name, pkg.dir, packageDir));
       } else {
         return id.source.install(id, packageDir).then((found) {
           if (found) return null;
           // TODO(nweiz): More robust error-handling.
           throw 'Package ${id.name} not found in source "${id.source.name}".';
         });
       }
@@ skipping 30 matching lines @@
       for (var dependency in dependencies) {
         solver.useLatestVersion(dependency);
       }
       return solver.solve();
     }).then(_installDependencies);
   }
 
   /// Removes the old packages directory, installs all dependencies listed in
   /// [packageVersions], and writes a [LockFile].
   Future _installDependencies(List<PackageId> packageVersions) {
-    return cleanDir(packagesDir).then((_) {
+    return new Future.of(() {
+      cleanDir(packagesDir);
       return Future.wait(packageVersions.map((id) {
         if (id.isRoot) return new Future.immediate(id);
         return install(id);
       }).toList());
     }).then(_saveLockFile)
       .then(_installSelfReference)
       .then(_linkSecondaryPackageDirs);
   }
 
   /// Traverses the root's package dependency graph and loads each of the
@@ skipping 145 matching lines @@
         });
       }).toList());
     }).then(flatten);
   }
 
   /// Creates a symlink to the `packages` directory in [dir]. Will replace one
   /// if already there.
   Future _linkSecondaryPackageDir(String dir) {
     return defer(() {
       var symlink = path.join(dir, 'packages');
-      return new Future.of(() {
-        if (fileExists(symlink)) {
-          deleteFile(symlink);
-        } else if (dirExists(symlink)) {
-          return deleteDir(symlink);
-        }
-      }).then((_) => createSymlink(packagesDir, symlink, relative: true));
+      if (fileExists(symlink)) {
+        deleteFile(symlink);
+      } else if (dirExists(symlink)) {
+        deleteDir(symlink);
+      }
+      return createSymlink(packagesDir, symlink, relative: true);
     });
   }
 }