FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 03:44:52 +00:00
Code Issues Releases Wiki Activity

configDB.pm: do not write a statefile in rescue mode

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26521 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2022-10-11 12:56:35 +00:00
parent 4d108d16ed
commit 718c93d731
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/configDB.pm
View File

@ -545,6 +545,9 @@ sub cfgDB_SaveCfg { ## prototype used in fhem.pl
sub cfgDB_SaveState {
my ($out,$val,$r,$rd,$t,@rowList);
# don't write statefile in rescue mode
return if ($configDB{attr}{rescue} == 1);
_cfgDB_deleteRF;
$t = localtime;
@ -640,41 +643,17 @@ sub cfgDB_MigrationImport {
push @files, $fn;
}
# find RSS layouts
# find RSS and Infopanel layouts
@def = '';
@def = _cfgDB_findDef('TYPE=RSS','LAYOUTFILE');
@def = _cfgDB_findDef('TYPE=(RSS|InfoPanel)','LAYOUTFILE');
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find InfoPanel layouts
# find weekprofile/LightScene/RHASSPY configurations
@def = '';
@def = _cfgDB_findDef('TYPE=InfoPanel','LAYOUTFILE');
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find weekprofile configurations
@def = '';
@def = _cfgDB_findDef('TYPE=weekprofile','CONFIGFILE');
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find LightScene configurations
@def = '';
@def = _cfgDB_findDef('TYPE=LightScene','CONFIGFILE');
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
}
# find RHASSPY configurations
@def = '';
@def = _cfgDB_findDef('TYPE=RHASSPY','CONFIGFILE');
@def = _cfgDB_findDef('TYPE=(weekprofile|LightScene|RHASSPY)','CONFIGFILE');
foreach my $fn (@def) {
next unless $fn;
push @files, $fn;
@ -696,7 +675,6 @@ sub cfgDB_MigrationImport {
$filename = "$modpath/FHEM/FhemUtils/uniqueID";
push @files,$filename if (-e $filename);
# do the import
foreach my $fn (@files) {
if ( -r $fn ) {