From b36e93c9361b2977721091d219ac22e66338aa89 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 27 Jan 2019 12:37:02 +0000 Subject: [PATCH] 98_update.pm: mark excluded files in check (Forum #96561) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18431 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/98_update.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/FHEM/98_update.pm b/FHEM/98_update.pm index 28e0cb18f..682091668 100644 --- a/FHEM/98_update.pm +++ b/FHEM/98_update.pm @@ -324,6 +324,11 @@ doUpdate($$$$) next if($r[0] ne "UPD"); my $fName = $r[3]; + my $wouldExcl; + foreach my $ex (@excl) { + $wouldExcl = 1 if($fName =~ m/$ex/ || "$src:$fName" =~ m/$ex/); + } + if($fName =~ m+\.\.+) { uLog 1, "Suspicious line $r, aborting"; return 1; @@ -334,12 +339,7 @@ doUpdate($$$$) } else { - my $isExcl; - if(!$isCheck) { # Forum #95944 - foreach my $ex (@excl) { - $isExcl = 1 if($fName =~ m/$ex/ || "$src:$fName" =~ m/$ex/); - } - } + my $isExcl = (!$isCheck && $wouldExcl); my $fPath = "$root/$fName"; $fPath = $0 if($fPath =~ m/$mainPgm/); my $fileOk = ($lh{$fName} && @@ -370,7 +370,8 @@ doUpdate($$$$) $nChanged++; my $sfx = ($arg eq "checktime" ? " $r[1]" : ""); $sfx =~ s/_.*//; - uLog 1, "$r[0] $fName$sfx"; + uLog 1, "$r[0] $fName$sfx". + ($isCheck && $wouldExcl ? " (excluded from update)" : ""); next if($isCheck); my $remFile = upd_getUrl("$basePath/$fName");