From f14b48bf9f67b82b865ecadd22045ded8b5a309f Mon Sep 17 00:00:00 2001 From: loredo Date: Sun, 10 Mar 2019 14:34:03 +0000 Subject: [PATCH] Meta.pm: move some variables git-svn-id: https://svn.fhem.de/fhem/trunk@18849 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Installer.pm | 8 -------- fhem/FHEM/Meta.pm | 24 ++++++++++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/fhem/FHEM/98_Installer.pm b/fhem/FHEM/98_Installer.pm index be46d2ff3..c91adeaf7 100644 --- a/fhem/FHEM/98_Installer.pm +++ b/fhem/FHEM/98_Installer.pm @@ -64,14 +64,6 @@ BEGIN { ); } -our $coreUpdate; -our %corePackageUpdates; -our %coreFileUpdates; - -our %moduleUpdates; -our %packageUpdates; -our %fileUpdates; - sub Define($$) { my ( $hash, $def ) = @_; my @a = split( "[ \t][ \t]*", $def ); diff --git a/fhem/FHEM/Meta.pm b/fhem/FHEM/Meta.pm index 603db460a..cbfab872e 100644 --- a/fhem/FHEM/Meta.pm +++ b/fhem/FHEM/Meta.pm @@ -37,12 +37,24 @@ return "$@" if ($@); return $ret if ($ret); use version 0.77; our $VERSION = $META{version}; -# sub import(@) { -# my $pkg = caller(0); -# -# if ( $pkg ne "main" ) { -# } -# } +our $coreUpdate; +our %corePackageUpdates; +our %coreFileUpdates; + +our %moduleUpdates; +our %packageUpdates; +our %fileUpdates; + +sub import(@) { + my $pkg = caller(0); + + # Initially load update information + # to be ready for meta analysis + __GetUpdatedata() unless ( defined($coreUpdate) ); + + if ( $pkg ne "main" ) { + } +} # Loads Metadata for single module, based on filename sub InitMod($$;$) {