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 chronometer output if web interface is not installed #3900

Merged
merged 2 commits into from
Dec 12, 2020

Conversation

ganto
Copy link
Contributor

@ganto ganto commented Dec 5, 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?:
Fix wrongly shifted version list in chronometer output if AdminLTE web interface is not installed. Current output:

|¯¯¯(¯)_|¯|_  ___|¯|___        Core: v5.2.1.
| ¯_/¯|_| ' \/ _ \ / -_)        Web: v5.3.2.
|_| |_| |_||_\___/_\___|        FTL:
 ——————————————————————————————————————————————————————————

Note that the version of FTL is printed on the "Web" line.
Output of pihole version:

  Pi-hole version is v5.2.1 (Latest: v5.2.1)
  FTL version is v5.3.2 (Latest: v5.3.2)

How does this PR accomplish the above?:
Set Web version to "n.a." if not reported by pihole version:

|¯¯¯(¯)_|¯|_  ___|¯|___        Core: v5.2.1.
| ¯_/¯|_| ' \/ _ \ / -_)        Web: n.a.
|_| |_| |_||_\___/_\___|        FTL: v5.3.2.
 ——————————————————————————————————————————————————————————

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

Signed-off-by: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
@ganto ganto changed the base branch from master to development December 5, 2020 02:11
@ganto
Copy link
Contributor Author

ganto commented Dec 5, 2020

Hmn, also the output of the debug script looks a bit weird. Will add another patch for that.

@ganto
Copy link
Contributor Author

ganto commented Dec 5, 2020

Hmn, also the output of the debug script looks a bit weird. Will add another patch for that.

It turned out the fix for the debug script might be a bit more controversy, so I decided to create a separate PR. See #3902.

This PR is then ready for review.

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
@DL6ER DL6ER merged commit 4147952 into pi-hole:development Dec 12, 2020
@ganto ganto deleted the fix/chrono-non-lte branch December 12, 2020 11:00
@PromoFaux PromoFaux mentioned this pull request Dec 23, 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-core-web-v5-2-2-and-ftl-v5-3-3-released/41998/1

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

4 participants