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

Side by Side Diff: utils/pub/entrypoint.dart

Issue 12772005: Handle broken symlinks when creating package dirs. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Revise. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | utils/pub/io.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library entrypoint; 5 library entrypoint;
6 6
7 import 'dart:async'; 7 import 'dart:async';
8 8
9 import '../../pkg/pathos/lib/path.dart' as path; 9 import '../../pkg/pathos/lib/path.dart' as path;
10 10
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 return _listDirWithoutPackages(file); 284 return _listDirWithoutPackages(file);
285 }).then((subfiles) { 285 }).then((subfiles) {
286 var fileAndSubfiles = [file]; 286 var fileAndSubfiles = [file];
287 fileAndSubfiles.addAll(subfiles); 287 fileAndSubfiles.addAll(subfiles);
288 return fileAndSubfiles; 288 return fileAndSubfiles;
289 }); 289 });
290 }).toList()); 290 }).toList());
291 }).then(flatten); 291 }).then(flatten);
292 } 292 }
293 293
294 /// Creates a symlink to the `packages` directory in [dir] if none exists. 294 /// Creates a symlink to the `packages` directory in [dir]. Will replace one
295 /// if already there.
295 Future _linkSecondaryPackageDir(String dir) { 296 Future _linkSecondaryPackageDir(String dir) {
296 return defer(() { 297 return defer(() {
297 var symlink = path.join(dir, 'packages'); 298 var symlink = path.join(dir, 'packages');
298 if (entryExists(symlink)) return; 299 return new Future.of(() {
299 return createSymlink(packagesDir, symlink, relative: true); 300 if (fileExists(symlink)) {
301 deleteFile(symlink);
302 } else if (dirExists(symlink)) {
303 return deleteDir(symlink);
304 }
305 }).then((_) => createSymlink(packagesDir, symlink, relative: true));
300 }); 306 });
301 } 307 }
302 } 308 }
OLDNEW
« no previous file with comments | « no previous file | utils/pub/io.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698