webui: Fixed the display date for the current version #6474

Merged
merged 3 commits into from Apr 22, 2017

Conversation

Projects
None yet
4 participants
@laf
Member

laf commented Apr 20, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

  • Have you signed the Contributors agreement - please do NOT submit a pull request unless you have (signing the agreement in the same pull request is fine). Your commit message for signing the agreement must appear as per the docs.
  • Have you followed our code guidelines?

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

Fixes: #6318

which doesn't work via the webinterface to detect git, whereis does but I'm not sure how universal that is. We now check the git response code to see if it exists. 1 is expected as we don't actually run a valid git command.

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
includes/common.php
@@ -1643,7 +1643,8 @@ function set_numeric($value, $default = 0)
function check_git_exists()
{
- if (`which git`) {
+ exec('git >> /dev/null 2>&1', $response, $exit_code);

This comment has been minimized.

@murrant

murrant Apr 22, 2017

Member

No need for double chevron >> here right?

@murrant

murrant Apr 22, 2017

Member

No need for double chevron >> here right?

This comment has been minimized.

@laf

laf Apr 22, 2017

Member

Technically no but we don't care for the output at all so I though suppressing it would be better. The exit code is all we care about here.

@laf

laf Apr 22, 2017

Member

Technically no but we don't care for the output at all so I though suppressing it would be better. The exit code is all we care about here.

This comment has been minimized.

@murrant

murrant Apr 22, 2017

Member

I mean isn't normally this? git > /dev/null 2>&1

@murrant

murrant Apr 22, 2017

Member

I mean isn't normally this? git > /dev/null 2>&1

This comment has been minimized.

@laf

laf Apr 22, 2017

Member

I actually just took that from our cron file, I can update to > though

@laf

laf Apr 22, 2017

Member

I actually just took that from our cron file, I can update to > though

This comment has been minimized.

@laf

laf Apr 22, 2017

Member

Updated

@laf

laf Apr 22, 2017

Member

Updated

@LibreNMS-CI

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Apr 22, 2017

The inspection completed: No new issues

The inspection completed: No new issues

@murrant murrant merged commit 056ddba into librenms:master Apr 22, 2017

3 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@laf laf deleted the laf:fix/issue-6318 branch Apr 22, 2017

@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 18, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

lock bot commented May 18, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@librenms librenms locked as resolved and limited conversation to collaborators May 18, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.