FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 12:07:09 +00:00
Code Issues Releases Wiki Activity

fhem.pl: do not generate additional include for save if configfile contains %L

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12022 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-08-21 09:28:23 +00:00
parent b1defbafec
commit 51c1a4883b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/fhem.pl
View File

@ -1193,13 +1193,13 @@ CommandInclude($$)
return "Can't open $arg: $!";
}
Log 1, "Including $arg";
if(!$init_done &&
$arg ne AttrVal("global", "statefile", "") &&
$arg ne AttrVal("global", "configfile", "")) {
my @t = localtime();
my $gcfg = ResolveDateWildcards(AttrVal("global", "configfile", ""), @t);
my $stf = ResolveDateWildcards(AttrVal("global", "statefile", ""), @t);
if(!$init_done && $arg ne $stf && $arg ne $gcfg) {
my $nr = $devcount++;
$comments{$nr}{TEXT} = "include $arg";
$comments{$nr}{CFGFN} = $currcfgfile
if($currcfgfile ne AttrVal("global", "configfile", ""));
$comments{$nr}{CFGFN} = $currcfgfile if($currcfgfile ne $gcfg);
}
$oldcfgfile = $currcfgfile;
$currcfgfile = $arg;