diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-09-01 10:48:10 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-09-01 19:43:03 +0100 |
| commit | f9a2a438be6dfa0c28dc81fdea604d5da8824cc9 (patch) | |
| tree | f073fb1546dc810fb0454010e2f8783581b08891 /solenv/bin | |
| parent | 62a9b1727878de6225ebc90514ce3de6a539d642 (diff) | |
installer: Make @items_at_modules non-global.
Change-Id: I869b521034f75b0146ee5aa0fdd5014f674bfa4c
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index c589a5d6a864..e824acb42ea6 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -96,7 +96,6 @@ BEGIN "tk", "ky-CN" ); - @items_at_modules = ("Files", "Dirs", "Unixlinks"); @rtllanguages = ("ar", "fa", "he", "ug", "ky-CN"); $ziplistname = ""; diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 2d7bd517061f..42ee98db274e 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -2406,8 +2406,8 @@ sub resolve_assigned_modules # Currently no merging of Files, Dirs, ... # This has to be included here, if it is required - my $item; - foreach $item (@installer::globals::items_at_modules) + my @items_at_modules = ("Files", "Dirs", "Unixlinks"); + for my $item (@items_at_modules) { if ( exists($directaccess{$templategid}->{$item}) ) { $onefeature->{$item} = $directaccess{$templategid}->{$item}; } } |