diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-02-26 10:18:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-02-26 10:18:14 +0000 |
| commit | 2d8e706e4c50857a436ad0fa72e9897ffe575928 (patch) | |
| tree | f929aa3fba1fa1b9610a302916c8a591e02d81bb | |
| parent | 41c609a989f5bcbfbb59bedd2774b769b73458ff (diff) | |
cmcfixes72: #i108609# fix up for newer rpmbuild
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 95f661160a0e..ffe79136b57e 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2544,6 +2544,7 @@ sub create_packages_without_epm my $dir = getcwd; my $buildroot = $dir . "/" . $epmdir . "buildroot/"; $buildrootstring = "--buildroot=$buildroot"; + mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/"); } my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build 0\" $specfilename --target $target $buildrootstring 2\>\&1 |"; @@ -2719,6 +2720,15 @@ sub remove_temporary_epm_files my $returnvalue = system($systemcall); + $removedir = $epmdir . "BUILD"; + + $systemcall = "rm -rf $removedir"; + + installer::logger::print_message( "... $systemcall ...\n" ); + + $returnvalue = system($systemcall); + + my $infoline = "Systemcall: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); |