FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-06 06:08:44 +00:00
Code Issues Releases Wiki Activity

version: more precise regexp check to avoid perl warnings on manual wrong generated $Id$ lines

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11026 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2016-03-08 07:25:45 +00:00
parent 5377076280
commit 729305ac7b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_version.pm
View File

@ -47,6 +47,7 @@ CommandVersion($$)
}
} else {
while(<FH>) {
chomp;
if(/#.*\$Id\:[^\$\n\r].+\$/) {
$line = $_;
last;
@ -62,7 +63,7 @@ CommandVersion($$)
$fhem_revision = "Latest Revision: $fhem_revision\n\n" if(defined($fhem_revision) && !$noheader);
@ret = map {/\$Id\: (\S+) (\S+) (.+?) \$/ ? sprintf("%-".$max."s %5d %s",$1,$2,$3) : $_} @ret;
@ret = map {/\$Id\: (\S+?) (\d+?) (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}Z \S+?) \$/ ? sprintf("%-".$max."s %5d %s",$1,$2,$3) : $_} @ret;
@ret = sort {version_sortModules($a, $b)} grep {($param ne "" ? /$param/ : 1)} @ret;
return "no loaded modules found that match: $param" if($param ne "" && $param ne "revision" && !@ret);
return (((!$param && !$noheader) || $param eq "revision") ? $fhem_revision : "").
@ -77,8 +78,8 @@ sub version_sortModules($$)
{
my ($a, $b) = @_;
$a =~ s/^No Id found for //;
$b =~ s/^No Id found for //;
$a =~ s/^(?:No Id found for |#\s*\$Id\: )//;
$b =~ s/^(?:No Id found for |#\s*\$Id\: )//;
my @a_vals = split(' ', $a);
my @b_vals = split(' ', $b);
@ -102,6 +103,7 @@ sub version_getRevFromControls(;$)
if(open(FH, $control_file)) {
while(<FH>) {
chomp;
if(/^REV\s+(\S+.*)$/) {
$revision = $1;
last;