Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

update: minor logging changes, check all/check/force case insensitive

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6479 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-08-29 18:04:01 +00:00
parent 86ac7c3f11
commit ee57856c8b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FHEM/98_update.pm
View File

@ -44,7 +44,8 @@ CommandUpdate($$)
my $ret = eval { "Hello" =~ m/$arg/ }; my $ret = eval { "Hello" =~ m/$arg/ };
return "first argument must be a valid regexp, all, force or check" return "first argument must be a valid regexp, all, force or check"
if($arg =~ m/^\?/ || $arg =~ m/^\*/ || $ret); if($arg =~ m/^[-\?\*]/ || $ret);
$arg = lc($arg) if($arg =~ m/^(check|all|force)$/i);
$updateInBackground = AttrVal("global","updateInBackground",undef); $updateInBackground = AttrVal("global","updateInBackground",undef);
$updateInBackground = 0 if($arg ne "all"); $updateInBackground = 0 if($arg ne "all");
@ -178,7 +179,10 @@ doUpdate($$)
foreach my $ex (@excl) { foreach my $ex (@excl) {
$isExcl = 1 if($fName =~ m/$ex/); $isExcl = 1 if($fName =~ m/$ex/);
} }
next if($isExcl); if($isExcl) {
uLog 4, "update: skipping $fName, matches exclude_from_update";
next;
}
if($isSingle) { if($isSingle) {
next if($fName !~ m/$arg/); next if($fName !~ m/$arg/);
@ -364,6 +368,7 @@ upd_initRestoreDirs($)
my @t = localtime; my @t = localtime;
my $restoreDir = sprintf("$rdName/%04d-%02d-%02d", my $restoreDir = sprintf("$rdName/%04d-%02d-%02d",
$t[5]+1900, $t[4]+1, $t[3]); $t[5]+1900, $t[4]+1, $t[3]);
Log 1, "MKDIR $restoreDir" if(! -d "$root/restoreDir");
upd_mkDir($root, $restoreDir, 0); upd_mkDir($root, $restoreDir, 0);
if(!opendir(DH, "$root/$rdName")) { if(!opendir(DH, "$root/$rdName")) {
@ -375,7 +380,7 @@ upd_initRestoreDirs($)
while(int(@oldDirs) > $nDirs) { while(int(@oldDirs) > $nDirs) {
my $dir = "$root/$rdName/". shift(@oldDirs); my $dir = "$root/$rdName/". shift(@oldDirs);
next if($dir =~ m/$restoreDir/); # Just in case next if($dir =~ m/$restoreDir/); # Just in case
uLog 1, "deleting: $dir"; uLog 1, "RMDIR: $dir";
upd_rmTree($dir); upd_rmTree($dir);
} }