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

Meta.pm: use built-in JSON:PP instead of JSON

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19212 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-04-18 08:33:11 +00:00
parent 11040c96e9
commit 5e46a8e41e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/Meta.pm
View File

@ -1242,7 +1242,8 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
if ( keys %json > 0 ) { if ( keys %json > 0 ) {
eval { eval {
require JSON; require JSON::PP;
JSON::PP::import();
1; 1;
}; };
@ -1278,7 +1279,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
return "$@" if ($@); return "$@" if ($@);
my $decoded = JSON::decode_json($t); my $decoded = decode_json($t);
while ( my ( $k, $v ) = each %{$decoded} ) { while ( my ( $k, $v ) = each %{$decoded} ) {
$modMeta->{$k} = $v; $modMeta->{$k} = $v;
} }
@ -3045,9 +3046,15 @@ sub __SetXVersion {
"abstract": "FHEM Entwickler Paket, um Metadaten Unterstützung zu aktivieren" "abstract": "FHEM Entwickler Paket, um Metadaten Unterstützung zu aktivieren"
} }
}, },
"version": "v0.5.0", "version": "v0.5.1",
"release_status": "testing", "release_status": "testing",
"x_changelog": { "x_changelog": {
"2019-04-18": {
"version": "v0.5.1",
"changes": [
"use built-in JSON:PP instead of JSON"
]
},
"2019-04-16": { "2019-04-16": {
"version": "v0.5.0", "version": "v0.5.0",
"changes": [ "changes": [
@ -3095,7 +3102,7 @@ sub __SetXVersion {
"version": 0 "version": 0
}, },
"recommends": { "recommends": {
"JSON": 0, "JSON::PP": 0,
"Perl::PrereqScanner::NotQuiteLite": 0, "Perl::PrereqScanner::NotQuiteLite": 0,
"Time::Local": 0 "Time::Local": 0
}, },