Forum Domoticz en français

Bonjour,

Je viens de vouloir faire la MAJ proposée, mais je n'y arrive pas.
J'ai cherché via le forum et google, sans succès.

Voilà le log ci dessous.

Qu'en pensez-vous ?

Merci de votre aide.

Lance la mise à jour du plugin.
Si cette mise à jour se passe sans problème, un redémarrage du plugin sera nécessaire pour la prise en compte, sinon il faudra faire la mise à jour de façon manuelle.

Starting Zigbee for Domoticz plugin Upgrade process.
----------------------------------------------------
PWD=/home/vcahen/domoticz/plugins/Domoticz-Zigbee
HOME=/home/vcahen/domoticz/plugins/Domoticz-Zigbee
LANG=en_GB.UTF-8
INVOCATION_ID=6876ff01416749d5a42709a2061c52e5
SHLVL=1
JOURNAL_STREAM=8:12925
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.004"}
latest git commit: d406956779ad5d0a4db05250af68d8f03527ae86 Update readme.md

(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.
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 d4069567..dd3e7cf2
ERROR while running command 'git pull --recurse-submodules'.
Git Status: On branch stable7
Your branch is behind 'origin/stable7' by 53 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")

depuis le repertoire du plugin que donne la commande

fatal: .git/index: index file open failed: Permission denied

A priori quelques soucis de droits d'accès

Merci
J'avais déjà essayé la 2è ligne, sans succès.

La première donne:
sudo git pull
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.
Updating d4069567..dd3e7cf2
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

puis

sudo git status
On branch stable7
Your branch is behind 'origin/stable7' by 53 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: plugin.py

Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitconfig
ReportsTransport-stats.json

no changes added to commit (use "git add" and/or "git commit -a")
vcahen@raspberrypi:~/domoticz/plugins/Domoticz-Zigbee $
ls -ld *
drwxr-xr-x 7 vcahen vcahen 4096 Nov 9 21:05 Classes
drwxr-xr-x 5 vcahen vcahen 4096 Nov 9 21:05 Conf
-rw-r--r-- 1 vcahen vcahen 3319 Nov 9 21:00 CONTRIBUTING.md
drwxr-xr-x 2 vcahen vcahen 4096 Nov 19 15:04 Data
drwxr-xr-x 3 vcahen vcahen 4096 Nov 9 21:05 DevicesModules
drwxr-xr-x 2 vcahen vcahen 4096 Nov 9 21:00 images
-rw-r--r-- 1 vcahen vcahen 4378 Nov 9 21:00 IMPORTANT.md
-rw-r--r-- 1 vcahen vcahen 35144 Nov 9 21:00 LICENSE.txt
drwxr-xr-x 2 vcahen vcahen 4096 Nov 19 03:47 Logs
-rw-r--r-- 1 vcahen vcahen 188 Nov 9 21:00 MANIFEST.in
drwxr-xr-x 3 vcahen vcahen 4096 Nov 9 21:05 Modules
drwxr-xr-x 14 vcahen vcahen 4096 Nov 9 21:00 OTAFirmware
-rwxr-xr-x 1 vcahen vcahen 78192 Nov 9 21:00 plugin.py
drwxr-x--- 2 vcahen vcahen 4096 Nov 9 21:05 __pycache__
-rw-r--r-- 1 vcahen vcahen 31 Nov 9 21:00 pyproject.toml
-rw-r--r-- 1 vcahen vcahen 7483 Nov 9 21:00 readme.md
-rw-r--r-- 1 vcahen vcahen 48452 Nov 9 21:00 ReleaseNotes.md
drwxr-xr-x 2 vcahen vcahen 4096 Nov 9 21:00 Reports
-rw-r----- 1 vcahen vcahen 266932 Nov 19 15:03 ReportsTransport-stats.json
-rw-r--r-- 1 vcahen vcahen 173 Nov 9 21:00 requirements.txt
-rw-r--r-- 1 vcahen vcahen 141 Nov 9 21:00 symlink.bat
drwxr-xr-x 4 vcahen vcahen 4096 Nov 9 21:00 Tools
-rw-r--r-- 1 vcahen vcahen 3374 Nov 9 21:00 VERSION-7.1.md
drwxr-xr-x 3 vcahen vcahen 4096 Nov 9 21:00 www
-rw-r--r-- 1 vcahen vcahen 305 Nov 9 21:00 z4d.caddyfile
drwxr-xr-x 3 vcahen vcahen 4096 Nov 9 21:05 Zigbee

Top, ça fonctionne !
Merci beaucoup.
Pour ma culture, est-ce un problème de mon fait ?

quelques soucis de droits d'accès. Et ensuite le fichier plugin.py avait été modifié

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: plugin.py