Pub fix for Windows

utils/pub/hosted_source.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 hosted_source;
 
 import 'dart:io' as io;
 import 'dart:json';
 import 'dart:uri';
 
@@ skipping 68 matching lines @@
     var tempDir;
     return Futures.wait([httpGet(fullUrl),
                          systemCache.createTempDir()]).chain((args) {
       tempDir = args[1];
       return timeout(extractTarGz(args[0], tempDir), HTTP_TIMEOUT,
           'Timed out while fetching URL "$fullUrl".');
     }).chain((_) {
       // Now that the install has succeeded, move it to the real location in
       // the cache. This ensures that we don't leave half-busted ghost
       // directories in the user's pub cache if an install fails.
-      var rename = renameDir(tempDir, destPath);
 
       // TODO(rnystrom): Awful hack. On Windows, we see cases where the extract

[Anders Johnsen, 2012/10/16 07:59:47]

Move inside if (windows).

[Johnni Winther, 2012/10/16 08:08:01]

Done.

       // has not finished by the time we get here, so the rename fails with a
       // "directory in use" error. So, we will just wait a couple of seconds
       // before we start.
       if (io.Platform.operatingSystem == "windows") {
-        rename = sleep(2000).chain((_) => rename);
+        return sleep(2000).chain((_) => renameDir(tempDir, destPath));
+      } else {
+        return renameDir(tempDir, destPath);
       }
-
-      return rename;
     }).transform((_) => true);
   }
 
   /**
    * The system cache directory for the hosted source contains subdirectories
    * for each separate repository URL that's used on the system. Each of these
    * subdirectories then contains a subdirectory for each package installed
    * from that site.
    */
   String systemCacheDirectory(PackageId id) {
@@ skipping 44 matching lines @@
 
     var name = description["name"];
     if (name is! String) {
       throw new FormatException("The 'name' key must have a string value.");
     }
 
     var url = description.containsKey("url") ? description["url"] : defaultUrl;
     return new Pair<String, String>(name, url);
   }
 }