diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-02 14:59:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-02 14:59:44 +0000 |
| commit | da85908b0b640d14cd49d63c275b95cfd6ff28a4 (patch) | |
| tree | 3eae07bd573fc814bcacb00fafbfb09e254dfeb2 /solenv/bin/modules | |
| parent | dc11911123254b5fb69cac5017aa1163b3dfe977 (diff) | |
INTEGRATION: CWS native135 (1.76.6); FILE MERGED
2008/03/05 11:37:55 is 1.76.6.2: #i84752# setting time stamp for pkginfo after faspc
2008/03/05 11:37:28 is 1.76.6.1: #i84752# setting time stamp for pkginfo after faspc
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 6ad85b2fbedd..5df62992c920 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -4,9 +4,9 @@ # # $RCSfile: epmfile.pm,v $ # -# $Revision: 1.77 $ +# $Revision: 1.78 $ # -# last change: $Author: vg $ $Date: 2008-03-18 12:58:55 $ +# last change: $Author: kz $ $Date: 2008-04-02 15:59:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -2141,6 +2141,12 @@ sub create_packages_without_epm my $compressorref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$faspac, $includepatharrayref, 0); if ($$compressorref ne "") { + # Saving original pkginfo, to set time stamp later + my $pkginfoorig = "$destinationdir/$packagename/pkginfo"; + my $pkginfotmp = "$destinationdir/$packagename" . ".pkginfo.tmp"; + $systemcall = "cp -p $pkginfoorig $pkginfotmp"; + make_systemcall($systemcall); + $faspac = $$compressorref; $infoline = "Found compressor: $faspac\n"; push( @installer::globals::logfileinfo, $infoline); @@ -2151,6 +2157,12 @@ sub create_packages_without_epm $systemcall = "/bin/sh $faspac -a -q -d $destinationdir $packagename"; # $faspac has to be the absolute path! make_systemcall($systemcall); + # Setting time stamp for pkginfo, because faspac-so.sh changed the pkginfo file, + # updated the size and checksum, but not the time stamp. + $systemcall = "touch -r $pkginfotmp $pkginfoorig"; + make_systemcall($systemcall); + if ( -f $pkginfotmp ) { unlink($pkginfotmp); } + installer::logger::include_timestamp_into_logfile("End of $faspac"); } else |