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

Allow using tabs in attr global (bugfix by Michael)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@937 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2011-07-08 12:14:12 +00:00
parent ec370305e8
commit 2d45cc97c5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/docs/HOWTO.html
View File

@@ -109,7 +109,7 @@
the changes will disappear after the next start. the changes will disappear after the next start.
<li>The CUL is arriving without a firmware. You can flash it via the <li>The CUL is arriving without a firmware. You can flash it via the
<a href="commandref.html#CULflash">CULflash</a> command, if the <a href="commandref.html#CULflash">CULflash</a> 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.
</ul> </ul>
</ul> </ul>

2
fhem/docs/fhem.html
View File

@@ -65,7 +65,7 @@
Current Version: (as of =DATE=): Current Version: (as of =DATE=):
<a href="http://fhem.de/fhem-=VERS=.tar.gz">fhem-=VERS=.tar.gz</a>, <a href="http://fhem.de/fhem-=VERS=.tar.gz">fhem-=VERS=.tar.gz</a>,
<a href="http://fhem.de/fhem-=VERS=.deb">fhem-=VERS=.deb</a> or <a href="http://fhem.de/fhem-=VERS=.deb">fhem-=VERS=.deb</a> or
<a href="http://fhem.de/fhem-=VERS=-fb7390.image">fhem-=VERS=-fb7390.image</a> or <a href="http://fhem.de/fhem-=VERS=-fb7390.image">fhem-=VERS=-fb7390.image</a>
<br> <br>
See the <a href="CHANGED">CHANGED</a> file for current changes. See the <a href="CHANGED">CHANGED</a> file for current changes.
<br> <br>

4
fhem/fhem.pl
View File

@@ -167,7 +167,7 @@ my $nextat; # Time when next timer will be triggered.
my $intAtCnt=0; my $intAtCnt=0;
my %duplicate; # Pool of received msg for multi-fhz/cul setups my %duplicate; # Pool of received msg for multi-fhz/cul setups
my $duplidx=0; # helper for the above pool 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 = my $namedef =
"where <name> is either:\n" . "where <name> is either:\n" .
"- a single device name\n" . "- a single device name\n" .
@@ -2525,7 +2525,7 @@ setGlobalAttrBeforeFork()
open(FH, $f) || die("Cant open $f: $!\n"); open(FH, $f) || die("Cant open $f: $!\n");
while(my $l = <FH>) { while(my $l = <FH>) {
chomp($l); chomp($l);
next if($l !~ m/^attr +global +([^ ]+) +(.*)$/); next if($l !~ m/^attr\s+global\s+([^\s]+)\s+(.*)$/);
my ($n,$v) = ($1,$2); my ($n,$v) = ($1,$2);
$v =~ s/#.*//; $v =~ s/#.*//;
$v =~ s/ .*$//; $v =~ s/ .*$//;