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

Report and exit if dig supportedOS returns nothing #3620

Merged
merged 2 commits into from
Jul 30, 2020
Merged

Report and exit if dig supportedOS returns nothing #3620

merged 2 commits into from
Jul 30, 2020

Conversation

yubiuser
Copy link
Member

By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]

  • 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?:
If dig for supportedOS does not return any value (e.g. due to misconfigured upstream DNS servers) it should report an appropriate error and exit the script

How does this PR accomplish the above?:
Check if supportedOS is an empty array.

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

@PromoFaux
Copy link
Member

Rebase please, following #3596

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

Done. (I think...)

Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux PromoFaux merged commit 48820d1 into pi-hole:release/v5.1.2 Jul 30, 2020
This was referenced Jul 30, 2020
@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-ftl-v5-2-released/36964/1

@yubiuser yubiuser deleted the tweak/dig_supportedOS branch August 10, 2020 20:19
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.

None yet

3 participants