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

Explicitly test for sysinfo files #296

Merged
merged 4 commits into from Dec 23, 2022
Merged

Explicitly test for sysinfo files #296

merged 4 commits into from Dec 23, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 16, 2022

Thank you for your contribution to the Pi-hole Community!

Please read the comments below to help us consider your Pull Request.

We are all volunteers and completing the process outlined will help us review your commits quicker.

Please make sure you

  1. Base your code and PRs against the repositories developmental branch.
  2. Sign Off all commits as we enforce the DCO for all contributions
  3. Sign all your commits as they must have verified signatures
  4. File a pull request for any change that requires changes to our documentation at our documentation repo

What does this PR aim to accomplish?:

Add an alternative implementation for the issue that should be solved in #295

How does this PR accomplish the above?:

Do not assume files exist and silence the error later but only use files we know existing.

Link documentation PRs if any are needed to support this PR:

N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@DL6ER DL6ER added the Bugfix label Dec 16, 2022
@DL6ER DL6ER requested a review from a team December 16, 2022 12:53
@DL6ER DL6ER changed the base branch from master to development December 17, 2022 15:10
@DL6ER
Copy link
Member Author

DL6ER commented Dec 17, 2022

Rebased on latest development and cherry-picked @rdwebdesign's docker commit dbbc32c from #295

yubiuser
yubiuser previously approved these changes Dec 17, 2022
DL6ER and others added 4 commits December 23, 2022 21:47
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member

Rebased on current development. As DL6ER authored the PR and I added two commits someone else (@rdwebdesign ?) needs to approve.

@rdwebdesign
Copy link
Member

One commit is mine too (41ce1c5)

Approved, anyway.

@yubiuser
Copy link
Member

I know, but 1 is 1 less than two. So you are less "biased"

@yubiuser yubiuser merged commit 1e83792 into development Dec 23, 2022
@yubiuser yubiuser deleted the fix/sysinfo_files branch December 23, 2022 21:04
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