OLD | NEW |
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 system_cache; | 5 library system_cache; |
6 | 6 |
7 import 'dart:io'; | 7 import 'dart:io'; |
8 import 'dart:async'; | 8 import 'dart:async'; |
9 | 9 |
10 import 'git_source.dart'; | 10 import 'git_source.dart'; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 _pendingInstalls[id] = future; | 77 _pendingInstalls[id] = future; |
78 return future; | 78 return future; |
79 } | 79 } |
80 | 80 |
81 /// Create a new temporary directory within the system cache. The system | 81 /// Create a new temporary directory within the system cache. The system |
82 /// cache maintains its own temporary directory that it uses to stage | 82 /// cache maintains its own temporary directory that it uses to stage |
83 /// packages into while installing. It uses this instead of the OS's system | 83 /// packages into while installing. It uses this instead of the OS's system |
84 /// temp directory to ensure that it's on the same volume as the pub system | 84 /// temp directory to ensure that it's on the same volume as the pub system |
85 /// cache so that it can move the directory from it. | 85 /// cache so that it can move the directory from it. |
86 Future<Directory> createTempDir() { | 86 Future<Directory> createTempDir() { |
87 return ensureDir(tempDir).then((temp) { | 87 // Make sure all errors propagate through future. |
| 88 return defer(() { |
| 89 var temp = ensureDir(tempDir); |
88 return io.createTempDir(join(temp, 'dir')); | 90 return io.createTempDir(join(temp, 'dir')); |
89 }); | 91 }); |
90 } | 92 } |
91 | 93 |
92 /// Delete's the system cache's internal temp directory. | 94 /// Delete's the system cache's internal temp directory. |
93 Future deleteTempDir() { | 95 Future deleteTempDir() { |
94 log.fine('Clean up system cache temp directory $tempDir.'); | 96 log.fine('Clean up system cache temp directory $tempDir.'); |
95 return dirExists(tempDir).then((exists) { | 97 // Make sure all errors propagate through future. |
96 if (!exists) return; | 98 return defer(() { |
| 99 if (!dirExists(tempDir)) return; |
97 return deleteDir(tempDir); | 100 return deleteDir(tempDir); |
98 }); | 101 }); |
99 } | 102 } |
100 } | 103 } |
OLD | NEW |