Handle broken symlinks when creating package dirs.

utils/pub/io.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.
 
 /// Helper functionality to make working with IO easier.
 library io;
 
 import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
@@ skipping 11 matching lines @@
 
 final NEWLINE_PATTERN = new RegExp("\r\n?|\n\r?");
 
 /// Returns whether or not [entry] is nested somewhere within [dir]. This just
 /// performs a path comparison; it doesn't look at the actual filesystem.
 bool isBeneath(String entry, String dir) {
   var relative = path.relative(entry, from: dir);
   return !path.isAbsolute(relative) && path.split(relative)[0] != '..';
 }
 
-/// Determines if a file or directory at [path] exists.
-bool entryExists(String path) => fileExists(path) || dirExists(path);
+/// Determines if a file or directory exists at [path].
+bool entryExists(String path) => dirExists(path) || fileExists(path);
 
-/// Determines if [file] exists on the file system.
-bool fileExists(String file) => new File(file).existsSync();
+/// Determines if [file] exists on the file system. Will also return `true` if
+/// [file] points to a symlink, even a directory symlink.
+bool fileExists(String file) =>
+    new File(file).existsSync() || new Link(file).existsSync();
 
 /// Reads the contents of the text file [file].
 String readTextFile(String file) =>
     new File(file).readAsStringSync(Encoding.UTF_8);
 
 /// Reads the contents of the binary file [file].
 List<int> readBinaryFile(String file) {
   log.io("Reading binary file $file.");
   var contents = new File(file).readAsBytesSync();
   log.io("Read ${contents.length} bytes from $file.");
   return contents;
 }
 
 /// Creates [file] and writes [contents] to it.
 ///
 /// If [dontLogContents] is true, the contents of the file will never be logged.
 String writeTextFile(String file, String contents, {dontLogContents: false}) {
   // Sanity check: don't spew a huge file.
   log.io("Writing ${contents.length} characters to text file $file.");
   if (!dontLogContents && contents.length < 1024 * 1024) {
     log.fine("Contents:\n$contents");
   }
 
   new File(file).writeAsStringSync(contents);
   return file;
 }
 
 /// Deletes [file].
 void deleteFile(String file) {
-  new File(file).deleteSync();
+  if (new Link(file).existsSync()) {
+    // If it's a (possibly broken) symlink, handle that.
+    return new Link(file).deleteSync();
+  } else {
+    // Assume it's a normal file.
+    new File(file).deleteSync();

[nweiz, 2013/03/15 21:00:17]

This will actually work on symlinks.

[Bob Nystrom, 2013/03/15 22:06:56]

Done.

+  }
 }
 
 /// Creates [file] and writes [contents] to it.
 String writeBinaryFile(String file, List<int> contents) {
   log.io("Writing ${contents.length} bytes to binary file $file.");
   new File(file).openSync(FileMode.WRITE)
       ..writeListSync(contents, 0, contents.length)
       ..closeSync();
   log.fine("Wrote text file $file.");
   return file;
@@ skipping 128 matching lines @@
 bool dirExists(String dir) => new Directory(dir).existsSync();
 
 /// "Cleans" [dir]. If that directory already exists, it will be deleted. Then a
 /// new empty directory will be created. Returns a [Future] that completes when
 /// the new clean directory is created.
 Future<String> cleanDir(String dir) {
   return defer(() {
     if (dirExists(dir)) {
       // Delete it first.
       return deleteDir(dir).then((_) => createDir(dir));
+    } if (fileExists(dir)) {

[nweiz, 2013/03/15 21:00:17]

"else if"

[Bob Nystrom, 2013/03/15 22:06:56]

Since those cases return anyway, reformatted and got rid of the other else too.

+      // If there is a non-directory there (file or symlink), delete it.
+      deleteFile(dir);
+      return createDir(dir);
     } else {
       // Just create it.
       return createDir(dir);
     }
   });
 }
 
 /// Renames (i.e. moves) the directory [from] to [to]. Returns a [Future] with
 /// the destination directory.
 Future<String> renameDir(String from, String to) {
@@ skipping 577 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);
 }