mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configDB.pm: prepare for holiday-filename-compatibility

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14296 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2017-05-15 18:56:49 +00:00
parent 48af5f3958
commit 2f0cef787d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/configDB.pm
View File

@@ -613,8 +613,12 @@ sub cfgDB_MigrationImport() {
@def = _cfgDB_findDef('TYPE=holiday','NAME'); @def = _cfgDB_findDef('TYPE=holiday','NAME');
foreach $filename (@def) { foreach $filename (@def) {
next unless $filename; next unless $filename;
if(defined($defs{$filename}{HOLIDAYFILE})) {
push @files, $defs{$filename}{HOLIDAYFILE};
} else {
push @files, "$modpath/FHEM/".$filename.".holiday"; push @files, "$modpath/FHEM/".$filename.".holiday";
} }
}
# import uniqueID file # import uniqueID file
$filename = "$modpath/FHEM/FhemUtils/uniqueID"; $filename = "$modpath/FHEM/FhemUtils/uniqueID";