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

reflect url prefix fix #322

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

reflect url prefix fix #322

wants to merge 1 commit into from

Conversation

mgood
Copy link
Collaborator

@mgood mgood commented Jan 23, 2025

I had deferred to the implementation on main here
in place of my conflicting update, but it seems
like that didn't work. Reusing the function from
handle is what I had been using on the branch
and seemed to work.

I had deferred to the implementation on main here
in place of my conflicting update, but it seems
like that didn't work. Reusing the function from
`handle` is what I had been using on the branch
and seemed to work.
@mgood mgood requested a review from ajbouh January 23, 2025 23:18
Copy link

netlify bot commented Jan 23, 2025

Deploy Preview for projectsubstrate canceled.

Name Link
🔨 Latest commit f78f1b0
🔍 Latest deploy log https://app.netlify.com/sites/projectsubstrate/deploys/6792ce5345f669000837b945

Copy link
Collaborator Author

@mgood mgood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can try to find the error again, but realized that bridge was failing to start after the merge, which I realized had fixed before on my dev branch, but then deferred back to the main version when I saw the conflict.

@@ -327,7 +327,7 @@ systemd_reload() {
dst=$2

echo >&2 "staging ${SUBSTRATEOS_OVERLAY_IMAGE_DIR}$src"
(cd ${SUBSTRATEOS_OVERLAY_IMAGE_DIR}$src; find .)
(sudo cd ${SUBSTRATEOS_OVERLAY_IMAGE_DIR}$src; find .)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was to fix a permission error on this line

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does sudo cd work? that seems like it would have no effect in a shell

if err != nil {
return name, def
}
if !strings.HasPrefix(u, "//") {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ajbouh not sure if you're relying on the // prefix here for other stuff. I think I had started with a similar implementation, but then found that the existing handle.EnsureRunHTTPRequestURLIncludesPrefix implementation already worked better here.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I use it in aliases.go. I'm not sure if this has the right semantics for these other situations. Do you need this alternative?

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.

2 participants