Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File::Spec::{Unix,OS2}->path(): Keep trailing empty PATH elements #22403

Merged
merged 2 commits into from
Jul 17, 2024
Merged

File::Spec::{Unix,OS2}->path(): Keep trailing empty PATH elements #22403

merged 2 commits into from
Jul 17, 2024

Conversation

aarondill
Copy link
Contributor

@aarondill aarondill commented Jul 14, 2024

Fixes #22346 by ensuring that trailing PATH elements are maintained on
Unix and OS2

@aarondill aarondill changed the title File::Spec::Unix->path(): Keep trailing empty PATH elements File::Spec::{Unix,OS2}->path(): Keep trailing empty PATH elements Jul 14, 2024
@aarondill
Copy link
Contributor Author

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

@jkeenan
Copy link
Contributor

jkeenan commented Jul 14, 2024

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see #22404 merged in first.

@jkeenan
Copy link
Contributor

jkeenan commented Jul 14, 2024

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see #22404 merged in first.

GH #22404 has been merged in to blead. That caused GitHub to append a hasConflicts label to this p.r. I attempted to resolve it via the web editor, only for GH now to tell me "This branch cannot be rebased due to conflicts."

I think I'll let the GH CI testing proceed before taking further action. In the meantime, if there is anyone else who wants to look over this pull request, please do so. Thanks.

@jkeenan jkeenan self-assigned this Jul 14, 2024
@jkeenan jkeenan requested review from tonycoz and book July 14, 2024 18:04
@jkeenan
Copy link
Contributor

jkeenan commented Jul 14, 2024

I've amended the commits to ensure all $VERSION values match (#22346 (comment))

This looks good to me, but I'd like to see #22404 merged in first.

GH #22404 has been merged in to blead. That caused GitHub to append a hasConflicts label to this p.r. I attempted to resolve it via the web editor, only for GH now to tell me "This branch cannot be rebased due to conflicts."

I think I'll let the GH CI testing proceed before taking further action. In the meantime, if there is anyone else who wants to look over this pull request, please do so. Thanks.

@tonycoz or @book, can either of you look at the code changes being requested here and approve? At that point, I'll deal with the merge problems. Thanks.

@aarondill

This comment has been minimized.

Fixes #22346 by ensuring that trailing PATH elements are maintained *on
Unix*
keeps empty trailing PATH segments on OS2.
I'm unsure of the OS2 semantics regarding PATH, so this is in a seperate
commit in case it needs to be reverted.
@aarondill
Copy link
Contributor Author

@jkeenan I've rebased onto bleed and resolved the conflicts. This should keep the commit history and diff cleaner 😄

@jkeenan
Copy link
Contributor

jkeenan commented Jul 15, 2024

@jkeenan I've rebased onto bleed and resolved the conflicts. This should keep the commit history and diff cleaner 😄

Thanks for that legwork. I've approved this commit and self-assigned. I'll allow for 2 or 3 days for other committers to approve, and then proceed to merge unless there's an objection.

@jkeenan jkeenan merged commit 9d1d951 into Perl:blead Jul 17, 2024
29 checks passed
@aarondill aarondill deleted the trailing-path branch July 17, 2024 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: File::Spec->path() doesn't keep trailing empty elements
3 participants