mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-12 08:41:41 +00:00
Meta.pm: remove obsolete workaround
git-svn-id: https://svn.fhem.de/fhem/trunk@19117 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
52c30491d6
commit
24044dfc5b
@ -4,9 +4,6 @@ package main;
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
# only to hopefully have this loaded before any module loads threads::shared
|
||||
use threads;
|
||||
|
||||
# provide the same hash as for real FHEM modules
|
||||
# in FHEM main context
|
||||
use vars qw(%packages);
|
||||
@ -1009,6 +1006,20 @@ sub GetModuleFilepath {
|
||||
elsif ( defined( $INC{$module} ) ) {
|
||||
push @path, $INC{$module};
|
||||
}
|
||||
|
||||
# avoid to load pragmas and guess their path ...
|
||||
elsif ( ModuleIsPerlPragma($package) ) {
|
||||
my $n = $INC{'version.pm'};
|
||||
$n =~ s/(.*\/).*/$1/;
|
||||
$n .= $module;
|
||||
|
||||
if ( -e $n ) {
|
||||
push @path, $n;
|
||||
}
|
||||
else {
|
||||
push @path, '';
|
||||
}
|
||||
}
|
||||
else {
|
||||
eval {
|
||||
require $module;
|
||||
@ -3131,7 +3142,7 @@ sub __SetXVersion {
|
||||
"abstract": "FHEM Entwickler Paket, um Metadaten Unterstützung zu aktivieren"
|
||||
}
|
||||
},
|
||||
"version": "v0.4.1",
|
||||
"version": "v0.4.2",
|
||||
"release_status": "testing",
|
||||
"author": [
|
||||
"Julian Pawlowski <julian.pawlowski@gmail.com>"
|
||||
|
Loading…
x
Reference in New Issue
Block a user