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

Fix regex on windows #24094

Merged
merged 1 commit into from
Jul 30, 2022
Merged

Fix regex on windows #24094

merged 1 commit into from
Jul 30, 2022

Conversation

demeritcowboy
Copy link
Contributor

Overview

Fix regex

Before

$argv[2] has "C:/path/to/git" prepended to it. Resulting patched file is an empty file.

After

Better

Technical Details

I dunno I guess in this context as an argument to a script it does argument expansion and preprocesses the / and thinks it's a file path and so converts it to an absolute file path? It might even be doing that on unix but happens to work out because the absolute path would be the same?

Comments

@seamuslee001

Since this is a vendor package, should it be one of those patches that only lives in cyberspace instead?

@civibot
Copy link

civibot bot commented Jul 30, 2022

(Standard links)

@civibot civibot bot added the master label Jul 30, 2022
@seamuslee001
Copy link
Contributor

@demeritcowboy given that it only applies to the 6.x and not 7.x of Guzzle and given that we now permit installing of the 7.x version I figured we wouldn't want to do it as a normal patch for the reason your hitting re league/csv

@seamuslee001 seamuslee001 merged commit 1769398 into civicrm:master Jul 30, 2022
@demeritcowboy demeritcowboy deleted the guzmock branch July 30, 2022 22:50
@demeritcowboy
Copy link
Contributor Author

Oh since I "fixed" the spacing for : now the outer grep doesn't work. Argh. Will fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants