mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-09 13:45:33 +00:00
fhem.pl: do not generate additional include for save if configfile contains %L
git-svn-id: https://svn.fhem.de/fhem/trunk@12022 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
b1defbafec
commit
51c1a4883b
10
fhem/fhem.pl
10
fhem/fhem.pl
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user