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

98_Installer: fix search tables

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19084 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2019-04-01 15:57:01 +00:00
parent 18a96a4de1
commit b266c9d00a
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
fhem/FHEM/98_Installer.pm
View File

@@ -1178,30 +1178,33 @@ sub CreatePrereqsList {
$linecount++;
}
push @ret, $tBClose;
if ( $linecount > 1 ) {
my $descr =
'These dependencies '
. $strongOpen . 'must'
. $strongClose
. ' be installed for the listed FHEM modules to work.';
$descr =
'These dependencies are '
. $strongOpen
. 'strongly encouraged'
. $strongClose
. ' and should be installed for full functionality of the listed FHEM modules, except in resource constrained environments.'
if ( $importance eq 'Recommended' );
$descr =
'These dependencies are '
. $strongOpen
. 'optional'
. $strongClose
. ', but are suggested for enhanced operation of the listed FHEM modules.'
if ( $importance eq 'Suggested' );
push @ret, $tBClose;
push @ret, $tFOpen . $tdOpen3 . $descr . $tFClose;
push @ret, $tClose . $blockClose . $tdClose . $trClose;
my $descr =
'These dependencies '
. $strongOpen . 'must'
. $strongClose
. ' be installed for the listed FHEM modules to work.';
$descr =
'These dependencies are '
. $strongOpen
. 'strongly encouraged'
. $strongClose
. ' and should be installed for full functionality of the listed FHEM modules, except in resource constrained environments.'
if ( $importance eq 'Recommended' );
$descr =
'These dependencies are '
. $strongOpen
. 'optional'
. $strongClose
. ', but are suggested for enhanced operation of the listed FHEM modules.'
if ( $importance eq 'Suggested' );
push @ret, $tFOpen . $tdOpen3 . $descr . $tFClose;
push @ret, $tClose . $blockClose . $tdClose . $trClose;
}
}
}
@@ -3136,6 +3139,7 @@ m/^([^<>\n\r]+?)(?:\s+(\(last release only\)))?(?:\s+(?:<(.*)>))?$/
. $lb
. 'This result is based on automatic source code analysis '
. 'and can be incorrect.'
. 'Suggested Perl items may still be required if the module author had decided to implement some own dependency and/or error handling like returning an informative message instead of the original Perl error message.'
. $tdClose
. $trClose
. $tFClose