From 2d45cc97c5a708898b0c98ecabb353ab760a816b Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 8 Jul 2011 12:14:12 +0000 Subject: [PATCH] Allow using tabs in attr global (bugfix by Michael) git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@937 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/docs/HOWTO.html | 2 +- fhem/docs/fhem.html | 2 +- fhem/fhem.pl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/docs/HOWTO.html b/fhem/docs/HOWTO.html index 49fb869fd..cd19824f1 100644 --- a/fhem/docs/HOWTO.html +++ b/fhem/docs/HOWTO.html @@ -109,7 +109,7 @@ the changes will disappear after the next start.
  • The CUL is arriving without a firmware. You can flash it via the CULflash command, if the - dfu-programmer is installed. dfu-programmer is part of the FB390 image. + dfu-programmer is installed. dfu-programmer is part of the FB7390 image. diff --git a/fhem/docs/fhem.html b/fhem/docs/fhem.html index 5d5b00447..e53bea58f 100644 --- a/fhem/docs/fhem.html +++ b/fhem/docs/fhem.html @@ -65,7 +65,7 @@ Current Version: (as of =DATE=): fhem-=VERS=.tar.gz, fhem-=VERS=.deb or - fhem-=VERS=-fb7390.image or + fhem-=VERS=-fb7390.image
    See the CHANGED file for current changes.
    diff --git a/fhem/fhem.pl b/fhem/fhem.pl index d46710599..c6ff992f1 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered. my $intAtCnt=0; my %duplicate; # Pool of received msg for multi-fhz/cul setups my $duplidx=0; # helper for the above pool -my $cvsid = '$Id: fhem.pl,v 1.145 2011-07-07 08:46:28 rudolfkoenig Exp $'; +my $cvsid = '$Id: fhem.pl,v 1.146 2011-07-08 12:14:12 rudolfkoenig Exp $'; my $namedef = "where is either:\n" . "- a single device name\n" . @@ -2525,7 +2525,7 @@ setGlobalAttrBeforeFork() open(FH, $f) || die("Cant open $f: $!\n"); while(my $l = ) { chomp($l); - next if($l !~ m/^attr +global +([^ ]+) +(.*)$/); + next if($l !~ m/^attr\s+global\s+([^\s]+)\s+(.*)$/); my ($n,$v) = ($1,$2); $v =~ s/#.*//; $v =~ s/ .*$//;