FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 20:17:45 +00:00
Code Issues Releases Wiki Activity

configDB.pm - changed: avoid fhem crash if Text::Diff not installed.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5187 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2014-03-10 15:29:28 +00:00
parent b95ddac7f5
commit 260b576037
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/configDB.pm
View File

@ -576,8 +576,8 @@ sub _cfgDB_Diff($$$) {
# compare device configurations from 2 versions # compare device configurations from 2 versions
sub cfgDB_Diff($$) { sub cfgDB_Diff($$) {
my ($search,$searchversion) = @_; my ($search,$searchversion) = @_;
eval {use Text::Diff}; eval {
return "error: Please install Text::Diff!" if($@); use Text::Diff;
my ($ret, $v0, $v1); my ($ret, $v0, $v1);
my $fhem_dbh = _cfgDB_Connect; my $fhem_dbh = _cfgDB_Connect;
$v0 = _cfgDB_Diff($fhem_dbh,$search,0); $v0 = _cfgDB_Diff($fhem_dbh,$search,0);
@ -586,6 +586,8 @@ sub cfgDB_Diff($$) {
$ret = diff \$v0, \$v1, { STYLE => "Table" }; $ret = diff \$v0, \$v1, { STYLE => "Table" };
$ret = "\nNo differences found!" if !$ret; $ret = "\nNo differences found!" if !$ret;
$ret = "compare device: $search in current version 0 (left) to version: $searchversion (right)\n$ret\n"; $ret = "compare device: $search in current version 0 (left) to version: $searchversion (right)\n$ret\n";
};
return "error: Please install Text::Diff!" if($@);
return $ret; return $ret;
} }