Daily updates failing. Untracked working tree error

Help
1

After creating a simple script to automate adding a number of devices leveraging addhost.php my daily updates seem to be failing. Not too sure how this would’ve happened, very well could’ve been some other accidental change.

Below is the output of ./validate ./daily and daily.log / email generated by the update failure stating “The following untracked working tree files would be overwritten by merge:”

Any assistance or thoughts would be greatly appreciated.

librenms@xxx:~$ ./validate.php

==========================================================

Component Version
LibreNMS 3264fa58964b6fba3aff86f3e1e08fd565f659b3
DB Schema 152
PHP 7.0.8-0ubuntu0.16.04.3
MySQL 10.0.28-MariaDB-0ubuntu0.16.04.1
RRDTool 1.5.5
SNMP NET-SNMP 5.7.3

==========================================================

[WARN] Your install is out of date, last update: Wed, 28 Dec 2016 08:47:06 +0000
[OK] Database connection successful

librenms@xxx:~$ ./daily.sh
Updating to latest codebase FAIL
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK

2

Try git pull and git status and see what the error is more specifically.

3

Thanks for the quick response. Below is the output requested:

librenms@xxx:~$ git pull
Updating 3264fa5…82579fb
error: The following untracked working tree files would be overwritten by merge:
LibreNMS/ComposerHelper.php
html/images/os/dcn.png
html/images/os/lancom.png
includes/discovery/os/apic.inc.php
includes/discovery/os/dcn-software.inc.php
includes/discovery/os/dell-ups.inc.php
includes/discovery/os/fujitsueternusos.inc.php
includes/discovery/os/hpe-msl.inc.php
includes/discovery/os/jetstream.inc.php
includes/discovery/os/lcos.inc.php
includes/polling/os/apic.inc.php
includes/polling/os/dcn-software.inc.php
includes/polling/os/dell-ups.inc.php
includes/polling/os/hpe-msl.inc.php
includes/polling/os/lcos.inc.php
mibs/fujitsu/FJDARY-E150
tests/snmpsim/apic.snmprec
tests/snmpsim/ciscowap-wap321.snmprec
tests/snmpsim/dcn-software.snmprec
tests/snmpsim/dell-ups.snmprec
tests/snmpsim/edgecos-ecs3510-52t.snmprec
tests/snmpsim/fujitsueternusos.snmprec
tests/snmpsim/hpe-msl.snmprec
tests/snmpsim/jetstream.snmprec
tests/snmpsim/lcos.snmprec
tests/snmpsim/lcos1.snmprec
Please move or remove them before you can merge.
Aborting

librenms@xxx:~$ git status
On branch master
Your branch is behind ‘origin/master’ by 30 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)
Untracked files:
(use “git add …” to include in what will be committed)

    LibreNMS/ComposerHelper.php
    html/images/os/dcn.png
    html/images/os/lancom.png
    includes/discovery/os/apic.inc.php
    includes/discovery/os/dcn-software.inc.php
    includes/discovery/os/dell-ups.inc.php
    includes/discovery/os/fujitsueternusos.inc.php
    includes/discovery/os/hpe-msl.inc.php
    includes/discovery/os/jetstream.inc.php
    includes/discovery/os/lcos.inc.php
    includes/polling/os/apic.inc.php
    includes/polling/os/dcn-software.inc.php
    includes/polling/os/dell-ups.inc.php
    includes/polling/os/hpe-msl.inc.php
    includes/polling/os/lcos.inc.php
    mibs/fujitsu/
    tests/snmpsim/apic.snmprec
    tests/snmpsim/ciscowap-wap321.snmprec
    tests/snmpsim/dcn-software.snmprec
    tests/snmpsim/dell-ups.snmprec
    tests/snmpsim/edgecos-ecs3510-52t.snmprec
    tests/snmpsim/fujitsueternusos.snmprec
    tests/snmpsim/hpe-msl.snmprec
    tests/snmpsim/jetstream.snmprec
    tests/snmpsim/lcos.snmprec
    tests/snmpsim/lcos1.snmprec

nothing added to commit but untracked files present (use “git add” to track)

4

Looks like you might have applied a patch manually or something.

Make sure you have a backup of whatever custom script you wrote (just in case).
Run git clean -f LibreNMS html includes mibs tests That should get you back in good shape and git status should not show any untracked files. If you have modified files you might need to run git checkout . too.

git pull and ./daily.sh should run now.

Run ./validate.php afterwards to check that everything is still correct.

5

You sir, are the man. Thank you so much for your quick response.

I had to manually remove an additional file before I was able to run a successful ‘git pull’ but it seems to be resolved now.

I did try to follow some other help threads before creating a new one myself and may have done some more damage than good.

Thank you again.

1 Like