Skip to content

Commit f8ee397

Browse files
committed
canonicalize before examining parents (gets rid of /.)
1 parent 7679721 commit f8ee397

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/src/package.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,17 +308,17 @@ See $workspacesDocUrl for more information.
308308
verifyLink(resolvedDir);
309309

310310
{
311-
final symlinkResolvedDir = symlinkResolvedDirs[resolvedDir] ??=
312-
Directory(resolvedDir).resolveSymbolicLinksSync();
313-
314-
for (final parent in parentDirs(p.dirname(resolvedDir))) {
311+
final canonicalized = p.canonicalize(resolvedDir);
312+
final symlinkResolvedDir = symlinkResolvedDirs[canonicalized] ??=
313+
Directory(canonicalized).resolveSymbolicLinksSync();
314+
for (final parent in parentDirs(p.dirname(canonicalized))) {
315315
final symlinkResolvedParent = symlinkResolvedDirs[parent] ??=
316316
Directory(parent).resolveSymbolicLinksSync();
317317
if (p.equals(symlinkResolvedDir, symlinkResolvedParent)) {
318318
dataError('''
319319
Pub does not support symlink cycles.
320320
321-
$resolvedDir => ${p.canonicalize(parent)}
321+
$symlinkResolvedDir => ${p.canonicalize(symlinkResolvedParent)}
322322
''');
323323
}
324324
}

0 commit comments

Comments
 (0)