mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 06:39:11 +00:00
98_update.pm: exclude_from_update can check to source too (Forum #73275)
git-svn-id: https://svn.fhem.de/fhem/trunk@14540 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
f5918085f0
commit
446b6214a0
@ -1,5 +1,6 @@
|
||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
||||
# Do not insert empty lines here, update check depends on it.
|
||||
- featere: exclude_from_update can check the source too (Forum #73275)
|
||||
- change: 93_DbRep: V5.2.0, preparation for UTF-8 support by DbLog
|
||||
- bugfix: 36_Vallox: Changed read. Added attributes. Changed DeviceID.
|
||||
- bugfix: MQTT: undef patch
|
||||
|
@ -334,7 +334,7 @@ doUpdate($$$$)
|
||||
|
||||
my $isExcl;
|
||||
foreach my $ex (@excl) {
|
||||
$isExcl = 1 if($fName =~ m/$ex/);
|
||||
$isExcl = 1 if($fName =~ m/$ex/ || "$src:$fName" =~ m/$ex/);
|
||||
}
|
||||
my $fPath = "$root/$fName";
|
||||
$fPath = $0 if($fPath =~ m/$mainPgm/);
|
||||
@ -733,6 +733,9 @@ upd_initRestoreDirs($)
|
||||
<ul>
|
||||
attr global exclude_from_update 21_OWTEMP.pm FS20.off.png
|
||||
</ul>
|
||||
The regexp is checked against the filename and the source:filename
|
||||
combination. To exclude the updates for FILE.pm from fhem.de, as you are
|
||||
updating it from another source, specify fhem.de.*:FILE.pm
|
||||
</li><br>
|
||||
|
||||
<a name="restoreDirs"></a>
|
||||
@ -841,6 +844,11 @@ upd_initRestoreDirs($)
|
||||
<ul>
|
||||
attr global exclude_from_update 21_OWTEMP.pm temp4hum4.gplot
|
||||
</ul>
|
||||
Der Regexp wird gegen den Dateinamen und gegen Quelle:Dateiname
|
||||
geprüft. Um die Datei FILE.pm von updates von fhem.de
|
||||
auszuschließen, weil sie von einer anderen Quelle bezogen wird,
|
||||
kann man fhem.de.*:FILE.pm spezifizieren.
|
||||
|
||||
</li><br>
|
||||
|
||||
<li><a href="#restoreDirs">restoreDirs</a>
|
||||
|
Loading…
Reference in New Issue
Block a user