@glyn.hudson - I’m seeing a few errors in the emonPi update.
The first one appeared a few updates ago. I’ve not made changes to the emonpi2c area. Is this something I need to delete by hand?
Filesystem is unlocked - Write access
type ' rpi-ro ' to lock
git pull /home/pi/emonpi
* master
wifiap
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
hardware/emonpi/emonpi2c/
nothing added to commit but untracked files present (use "git add" to track)
Already up-to-date.
This one I may have changed a few months ago but I’m not sure how to fix. Deleting any changes I made to power_to_kwh.php is fine. I don’t need to keep them.
git pull /home/pi/usefulscripts
* master
On branch master
Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: process/power_to_kwh.php
deleted: readme.md
no changes added to commit (use "git add" and/or "git commit -a")
Updating 6cf8e48..c51627e
See the invalid (git+https://github.com/openenergymonitor/node-red- contrib-emonpixel.git#cb1458afd9eb477a0defdd72668ed81108948e88).
Is this OK?
Starting OpenEnergyMonitor emonHub: emonhub has been started ok.
[email protected] /home/pi/data/node-red
└── [email protected] invalid (git+https://github.com/openenergymonitor/node-red-
contrib-emonpixel.git#cb1458afd9eb477a0defdd72668ed81108948e88)
[email protected] /home/pi/data/node-red
└── [email protected]
and here is the last one:
Your branch is up-to-date with 'origin/stable'.
Cannot find emoncms-setup module, please update ~/emonpi repo
update mqtt_input systemd unit file
Update Emoncms database
The first two look like the output from git status. I looked through the emonPi Update scripts and I didn’t find the git status command. Is this something I turned on in error?
Hi @Jon , thanks for letting me know. The git errors don’t look too serious and should be easy to fix. If you just cd into the git folder in question on the emonPi then after ensuring your in RW mode $rpi-rw run $ git stash to clear any local changes then run $ git pull to pull in any local changes, $ git status will tell us what’s going on.
I would be interested to see the full update logfile to see whats going on with emoncms-setup error. Would it be possible to attach full update log?
I’ll try the git stash / pull / status and report back. And try running the emonpi update again (and report back)
EDIT: here is the git stash / pull / status for the /home/pi/emonpi area.
pi@emonpi(ro):~$ cd /home/pi/emonpi
pi@emonpi(ro):emonpi$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
hardware/emonpi/emonpi2c/
nothing added to commit but untracked files present (use "git add" to track)
pi@emonpi(ro):emonpi$ rpi-rw
Filesystem is unlocked - Write access
type ' rpi-ro ' to lock
pi@emonpi(rw):emonpi$ git stash
No local changes to save
pi@emonpi(rw):emonpi$ git pull
Already up-to-date.
pi@emonpi(rw):emonpi$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
hardware/emonpi/emonpi2c/
nothing added to commit but untracked files present (use "git add" to track)
pi@emonpi(rw):emonpi$
Here is the git stash / pull / status for the /home/pi/usefulscripts area:
pi@emonpi(rw):emonpi$ cd /home/pi/usefulscripts
pi@emonpi(rw):usefulscripts$ git status
On branch master
Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: process/power_to_kwh.php
deleted: readme.md
no changes added to commit (use "git add" and/or "git commit -a")
pi@emonpi(rw):usefulscripts$ git stash
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: empty ident name (for <pi@emonpi.(none)>) not allowed
Cannot save the current index state
pi@emonpi(rw):usefulscripts$ git pull
Updating 6cf8e48..c51627e
error: Your local changes to the following files would be overwritten by merge:
process/power_to_kwh.php
Please, commit your changes or stash them before you can merge.
Aborting
pi@emonpi(rw):usefulscripts$ git status
On branch master
Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: process/power_to_kwh.php
deleted: readme.md
no changes added to commit (use "git add" and/or "git commit -a")
pi@emonpi(ro):usefulscripts$