From 51c1a4883b5ac990197cec7ff9a0c4aa150bbc47 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 21 Aug 2016 09:28:23 +0000 Subject: [PATCH] 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 --- fhem/fhem.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fhem/fhem.pl b/fhem/fhem.pl index 3fff1a01b..53854d03a 100755 --- a/fhem/fhem.pl +++ b/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;