J'ai l'erreur suivante lors de la mise a jour du pluging zigbee (Plugin: 7.1.011 [5.260]):
"no changes added to commit (use "git add" and/or "git commit -a")"
Le log complet :
Code : Tout sélectionner
Starting Zigbee for Domoticz plugin Upgrade process.
----------------------------------------------------
PWD=/home/freebox/domoticz/plugins/Domoticz-Zigbee
HOME=/home/freebox/domoticz/plugins/Domoticz-Zigbee
LANG=C.UTF-8
INVOCATION_ID=139af2449bda41628aebac77e96483be
SHLVL=1
JOURNAL_STREAM=8:12313
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
_=/bin/env
uid=0(root) gid=0(root) groups=0(root)
root
PIP Options: --no-input install -r requirements.txt --ignore-requires-python --upgrade
Current version : {"branch": "stable7", "version": "7.1.011"}
latest git commit: 64952b7e69b2c1c69b6e4e2adcd9bfd6fa3727e1 Bump 7.1.011
(1) git config --global --add safe.directory
(2) updating Zigbee for Domoticz plugin
Setup submodule.recurse
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
From https://github.com/zigbeefordomoticz/Domoticz-Zigbee
* [new branch] webui-rssi -> origin/webui-rssi
error: Your local changes to the following files would be overwritten by merge:
plugin.py
Please commit your changes or stash them before you merge.
Aborting
Updating 64952b7e..143b51cd
ERROR while running command 'git pull --recurse-submodules'.
Git Status: On branch stable7
Your branch is behind 'origin/stable7' by 314 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: plugin.py
Untracked files:
(use "git add ..." to include in what will be committed)
.gitconfig
ReportsTransport-stats.json
no changes added to commit (use "git add" and/or "git commit -a")
Merci
Ma config :
Version: 2024.4
Build Hash: 731719420
Compile Date: 2024-01-30 09:16:34
dzVents Version: 3.1.8
Python Version: 3.9.2 (default, Feb 28 2021, 17:03:44) [GCC 10.2.1 20210110]