FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-14 05:46:35 +00:00
Code Issues Releases Wiki Activity

fhem.pl: change DevIo path in require (Forum #110125)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21661 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-04-13 10:34:40 +00:00
parent 37ad4f245b
commit 2a512929a6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/contrib/pre-commit
View File

@ -67,8 +67,9 @@ foreach my $row (split("\n", $fList)) {
die("Cant svnlook cat $fName:$!\n"); die("Cant svnlook cat $fName:$!\n");
while(my $l = <FILE>) { while(my $l = <FILE>) {
$hasId = ($l =~ /#.*?\$Id(?:\:.+)?\$/); $hasId = ($l =~ /#.*?\$Id(?:\:.+)?\$/) if(!$hasId);
last if($hasId); err $fName, "DevIo must be loaded via use (Forum #110125)."
if($l =~ m/require.*modpath.*DevIo.pm/);
} }
close(FILE); close(FILE);
err $fName, "file has no SVN Id as comment" unless($hasId); err $fName, "file has no SVN Id as comment" unless($hasId);

2
fhem/fhem.pl
View File

@ -5585,7 +5585,7 @@ fhemFork()
if($h->{DBH} && $h->{TYPE} eq 'DbLog'); #Forum #43271 if($h->{DBH} && $h->{TYPE} eq 'DbLog'); #Forum #43271
TcpServer_Close($h) if($h->{SERVERSOCKET}); TcpServer_Close($h) if($h->{SERVERSOCKET});
if($h->{DeviceName}) { if($h->{DeviceName}) {
require "$attr{global}{modpath}/FHEM/DevIo.pm"; require "DevIo.pm";
DevIo_CloseDev($h,1); DevIo_CloseDev($h,1);
} }
} }