FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 11:01:59 +00:00
Code Issues Releases Wiki Activity

98_update.pm: exclude_from_update can check to source too (Forum #73275)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14540 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-06-19 09:02:19 +00:00
parent f5918085f0
commit 446b6214a0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - change: 93_DbRep: V5.2.0, preparation for UTF-8 support by DbLog
- bugfix: 36_Vallox: Changed read. Added attributes. Changed DeviceID. - bugfix: 36_Vallox: Changed read. Added attributes. Changed DeviceID.
- bugfix: MQTT: undef patch - bugfix: MQTT: undef patch

10
fhem/FHEM/98_update.pm
View File

@ -334,7 +334,7 @@ doUpdate($$$$)
my $isExcl; my $isExcl;
foreach my $ex (@excl) { foreach my $ex (@excl) {
$isExcl = 1 if($fName =~ m/$ex/); $isExcl = 1 if($fName =~ m/$ex/ || "$src:$fName" =~ m/$ex/);
} }
my $fPath = "$root/$fName"; my $fPath = "$root/$fName";
$fPath = $0 if($fPath =~ m/$mainPgm/); $fPath = $0 if($fPath =~ m/$mainPgm/);
@ -733,6 +733,9 @@ upd_initRestoreDirs($)
<ul> <ul>
attr global exclude_from_update 21_OWTEMP.pm FS20.off.png attr global exclude_from_update 21_OWTEMP.pm FS20.off.png
</ul> </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> </li><br>
<a name="restoreDirs"></a> <a name="restoreDirs"></a>
@ -841,6 +844,11 @@ upd_initRestoreDirs($)
<ul> <ul>
attr global exclude_from_update 21_OWTEMP.pm temp4hum4.gplot attr global exclude_from_update 21_OWTEMP.pm temp4hum4.gplot
</ul> </ul>
Der Regexp wird gegen den Dateinamen und gegen Quelle:Dateiname
gepr&uuml;ft. Um die Datei FILE.pm von updates von fhem.de
auszuschlie&szlig;en, weil sie von einer anderen Quelle bezogen wird,
kann man fhem.de.*:FILE.pm spezifizieren.
</li><br> </li><br>
<li><a href="#restoreDirs">restoreDirs</a> <li><a href="#restoreDirs">restoreDirs</a>