summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTim Retout <tim@retout.co.uk>2012-09-26 21:56:28 +0100
committerTim Retout <tim@retout.co.uk>2012-09-26 21:56:28 +0100
commitacaaf6c72162566e896421e03ee4c966936c7917 (patch)
tree69c297c8b8fd4bb7ac21055108381c6aae97e42f /solenv
parentc003a803868a0faaae0f5b6949ffcaab54f7ef32 (diff)
installer: Move key_in_a_is_also_key_in_b into scriptfiles.pm
Change-Id: I466b285ddc9f3ac53978acefe76c27fa212d812c
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm28
-rw-r--r--solenv/bin/modules/installer/worker.pm26
2 files changed, 27 insertions, 27 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 42ee98db274e..9ce5bd62bb6c 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2146,7 +2146,7 @@ sub get_string_of_modulegids_for_itemgid
# Check: All modules or no module must have flag LANGUAGEMODULE
if ( $haslanguagemodule )
{
- my $isreallylanguagemodule = installer::worker::key_in_a_is_also_key_in_b(\%foundmodules, \%installer::globals::alllangmodules);
+ my $isreallylanguagemodule = _key_in_a_is_also_key_in_b(\%foundmodules, \%installer::globals::alllangmodules);
if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid"); }
}
@@ -2498,4 +2498,30 @@ sub select_required_language_strings
}
}
+################################################
+# Controlling that all keys in hash A are
+# also key in hash B.
+################################################
+
+sub _key_in_a_is_also_key_in_b
+{
+ my ( $hashref_a, $hashref_b) = @_;
+
+ my $returnvalue = 1;
+
+ my $key;
+ foreach $key ( keys %{$hashref_a} )
+ {
+ if ( ! exists($hashref_b->{$key}) )
+ {
+ print "*****\n";
+ foreach $keyb ( keys %{$hashref_b} ) { print "$keyb : $hashref_b->{$keyb}\n"; }
+ print "*****\n";
+ $returnvalue = 0;
+ }
+ }
+
+ return $returnvalue;
+}
+
1;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index e895f5485188..017f2ab7af17 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1252,32 +1252,6 @@ sub resolving_hidden_flag
push( @installer::globals::logfileinfo, $infoline);
}
-################################################
-# Controlling that all keys in hash A are
-# also key in hash B.
-################################################
-
-sub key_in_a_is_also_key_in_b
-{
- my ( $hashref_a, $hashref_b) = @_;
-
- my $returnvalue = 1;
-
- my $key;
- foreach $key ( keys %{$hashref_a} )
- {
- if ( ! exists($hashref_b->{$key}) )
- {
- print "*****\n";
- foreach $keyb ( keys %{$hashref_b} ) { print "$keyb : $hashref_b->{$keyb}\n"; }
- print "*****\n";
- $returnvalue = 0;
- }
- }
-
- return $returnvalue;
-}
-
######################################################
# Getting the first entry from a list of languages
######################################################