Skip to content

Commit 8e10572

Browse files
committed
Revert "Merge pull request #287 from MasterDuke17/master"
This reverts commit 62d0dba, reversing changes made to ca37f08. Rakudo's IO::Path relies on absolute paths returned from nextfiledir, and since we cannot emulate the solution moar uses in IO::Path (because Java does not support changing the CWD, at least not without platform-dependent hacks) we will have to accept this inconsistency until someone rewrites IO::Path. This reverts the failure mode for install-core-dist.pl on Rakudo-j back to "setcodeobj can only be used with a CodeRef", from leaking a Java-level NoSuchFileException.
1 parent 9dead8a commit 8e10572

File tree

1 file changed

+1
-1
lines changed
  • src/vm/jvm/runtime/org/perl6/nqp/runtime

1 file changed

+1
-1
lines changed

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ public static String nextfiledir(SixModelObject obj, ThreadContext tc) {
12141214
IOHandleInstance ioh = (IOHandleInstance)obj;
12151215
if (ioh.dirstrm != null && ioh.diri != null) {
12161216
if (ioh.diri.hasNext()) {
1217-
return ioh.diri.next().getFileName().toString();
1217+
return ioh.diri.next().toString();
12181218
} else {
12191219
return null;
12201220
}

0 commit comments

Comments
 (0)