diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 22:54:32 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:36 +0100 |
| commit | 5503a68395641d8ae927c635eec2960c617ddbc3 (patch) | |
| tree | 1f2a4a5d0740d524df450b566998ba51b4df052e /solenv | |
| parent | 3df5304ada4cec75072bc71f24ab82fe9b48d97c (diff) | |
cli_ure: remove CLI version Packages
Tweak the installer so it reads the included files from SRCDIR.
Change-Id: Ic4d3d2c003c2d0c5aebea6dd32f5989f3d4f04e4
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 662069532fe0..261bd19d6d86 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -542,13 +542,13 @@ sub add_variables_from_inc_to_hashref { $includefilename =~ s/^\s*//; $includefilename =~ s/\s*$//; - $includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1); - if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); } + $includefilenameref = $ENV{'SRCDIR'} . "/" . $includefilename; + if ( ! -f $includefilenameref ) { installer::exiter::exit_program("Include file $includefilename ($includefilenameref) not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); } - $infoline = "Including inc file: $$includefilenameref \n"; + $infoline = "Including inc file: $includefilenameref \n"; push( @installer::globals::globallogfileinfo, $infoline); - my $includefile = installer::files::read_file($$includefilenameref); + my $includefile = installer::files::read_file($includefilenameref); for ( my $j = 0; $j <= $#{$includefile}; $j++ ) { |