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 debugger stripping content it shouldn't #3892

Merged
merged 1 commit into from
Dec 2, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 2, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

Strip only lines starting with a #. Do not silently truncate lines if they have a # somewhere in between (like server=127.0.0.1#5353).

How does this PR accomplish the above?:

Fix an imprecise sed command.

Real content:

server=127.0.0.1#5353

pihole -d now:

server=127.0.0.1  <---- [the rest of the line is silently truncated !]

pihole -d with this fix:

server=127.0.0.1#5353

Lines starting with # ("real comments") are still silently skipped

What documentation changes (if any) are needed to support this PR?:

None

… they have a # somewhere in between (like server=127.0.0.1#5353)

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bug: fixed Contains a bug resolution label Dec 2, 2020
@DL6ER
Copy link
Member Author

DL6ER commented Dec 2, 2020

Travis - Branch didn't pick up the branch at all.

As Travis - PR reports ✔️ we should be good to go.

@DL6ER DL6ER merged commit db231de into release/v5.2.1 Dec 2, 2020
@DL6ER DL6ER deleted the fix/debug_strip_comments branch December 2, 2020 20:23
@PromoFaux
Copy link
Member

Cool, update the release notes ;) (and the blog draft)

@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-1-and-ftl-v5-3-2-released/41148/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug: fixed Contains a bug resolution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants