From ac2a6ebf96250dfc08db43e462b50332c1dfaf65 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 30 Apr 2015 13:23:09 +0000 Subject: [PATCH] 98_update.pm: check for the local size of the file, split commandref_join.pl answers (Forum #36773) git-svn-id: https://svn.fhem.de/fhem/trunk@8502 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_update.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/98_update.pm b/fhem/FHEM/98_update.pm index ba0737409..2c217eb2c 100644 --- a/fhem/FHEM/98_update.pm +++ b/fhem/FHEM/98_update.pm @@ -199,19 +199,21 @@ doUpdate($$) next if($fName !~ m/$arg/); } else { + my $sz = -s "$root/$fName"; next if($lh{$fName} && $lh{$fName}{TS} eq $r[1] && + $sz && $sz eq $r[2] && $lh{$fName}{LEN} eq $r[2]); } uLog 1, "List of new / modified files since last update:" if($arg eq "check" && $nChanged == 0); + + $needJoin = 1 if($fName =~ m/commandref_frame/ || $fName =~ m/\d+.*.pm/); + next if($fName =~ m/commandref.*html/ && $fName !~ m/frame/ && $canJoin); $nChanged++; - if($fName =~ m,docs/commandref(_..)?.html, && $canJoin) { - $needJoin = 1; - next; - } + uLog 1, "$r[0] $fName"; next if($arg eq "check"); @@ -255,7 +257,9 @@ doUpdate($$) chdir($root); uLog(1, "Calling $^X $cj, this may take a while"); my $ret = `$^X $cj`; - uLog(1, $ret) if($ret); + foreach my $l (split(/[\r\n]+/, $ret)) { + uLog(1, $l); + } } uLog(1, "");