[ooo-build-commit] Branch 'ooo/master' - solenv/bin

[Jan Holesovsky]

 solenv/bin/modules/installer/epmfile.pm      |    4 +--
 solenv/bin/modules/installer/xpdinstaller.pm |   29 ++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit e4497a84daa75eceadc3db1c85d48935654aea8b
Author: Kurt Zenker <kz at openoffice.org>
Date:   Wed Jun 3 08:13:57 2009 +0000

    CWS-TOOLING: integrate CWS sysui37
    2009-05-19 12:44:43 +0200 ihi  r272072 : #i101914# rpm installer fix
    2009-05-18 19:08:13 +0200 ihi  r272047 : #i98650# rpm rebuild issue
    2009-05-18 16:52:13 +0200 ihi  r272036 : #i101916# rpm fix
    2009-05-18 16:39:55 +0200 ihi  r272035 : #i101914# sysui rpm fix

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 9db17f5..d68ec2a 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2519,7 +2519,7 @@ sub create_packages_without_epm
 
         # saving globally for later usage
         $installer::globals::rpmcommand = $rpmcommand;
-        $installer::globals::rpmquerycommand = "rpm"; # For queries "rpm" is used, not "rpmbuild" (for this call the LD_LIBRARY_PATH is not required!)
+        $installer::globals::rpmquerycommand = "rpm";
 
         my $target = "";
         if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
@@ -2536,7 +2536,7 @@ sub create_packages_without_epm
             $buildrootstring = "--buildroot=$buildroot";
         } 
 
-        my $systemcall = "$rpmcommand -bb $specfilename --target $target $buildrootstring 2\>\&1 |";
+        my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
         installer::logger::print_message( "... $systemcall ...\n" );
 
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 8eeab18..fde62da 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -570,9 +570,19 @@ sub get_size_value
     if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
     {	
         # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } # For queries "rpm" is used, not "rpmbuild"
+        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
 
         my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
+        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
+        if ( defined $ENV{SYSBASE}) {
+            my $sysbase = $ENV{SYSBASE};
+            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
+                $ld_library_backup = "" if ! defined $ld_library_backup;
+                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
+            } else {
+                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
+            }
+        }
         my ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
         # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH 
         if ( $error )
@@ -582,6 +592,7 @@ sub get_size_value
             ($rpmout, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
             if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_size_value"); }
         }
+        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
         $value = do_sum($rpmout);		# adding all filesizes in bytes
         $value = $value/1000;
 
@@ -698,10 +709,18 @@ sub get_fullpkgname_value
         }
         
         # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); }
-        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; } # For queries "rpm" is used, not "rpmbuild"
+        if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
         my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
-        # my $returnarray = make_systemcall($systemcall, 0);
-
+        my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
+        if ( defined $ENV{SYSBASE}) {
+            my $sysbase = $ENV{SYSBASE};
+            if ( !defined ($ld_library_backup) or ("$ld_library_backup" eq "") ) {
+                $ld_library_backup = "" if ! defined $ld_library_backup;
+                $ENV{LD_LIBRARY_PATH} = "$sysbase/usr/lib";
+            } else {
+                $ENV{LD_LIBRARY_PATH} = "$ld_library_backup:$sysbase/lib";
+            }
+        }
         my ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 1);
         # Evaluating an error, because of rpm problems with removed LD_LIBRARY_PATH 
         if ( $error )
@@ -711,8 +730,8 @@ sub get_fullpkgname_value
             ($returnarray, $error) = make_systemcall_allowing_error($systemcall, 0, 0);
             if ( $error ) { installer::exiter::exit_program("ERROR: rpm failed to query package!", "get_fullpkgname_value"); }
         }
-
         $value = ${$returnarray}[0];
+        $ENV{LD_LIBRARY_PATH} = $ld_library_backup;
         installer::remover::remove_leading_and_ending_whitespaces(\$value);
 
         my $rpmname = $packagename;