ooo-build r12277 - branches/sled-10-sp1-ooo-build-2-4/patches/src680

[tml svn gnome org]

Author: tml
Date: Tue Apr 22 09:56:00 2008
New Revision: 12277
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12277&view=rev

Log:
2008-04-22  Tor Lillqvist  <tml novell com>

	* patches/src680/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): As the timestamp used for
	the "Installer Files" folder is one when *creating* the installer,
	just use a hex timestamp, it doesn't have to have any meaning
	to the end-user, as long as it is uniqueish.



Modified:
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/win32-multi-lang-installer.diff	Tue Apr 22 09:56:00 2008
@@ -479,14 +479,6 @@
 +}
 --- solenv/bin/modules/installer/download.pm
 +++ solenv/bin/modules/installer/download.pm
-@@ -35,6 +35,7 @@
- 
- package installer::download;
- 
-+use POSIX qw(strftime);
- use File::Spec;
- use installer::exiter;
- use installer::files;
 @@ -807,9 +807,7 @@
  	
  	my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
@@ -494,7 +486,7 @@
 -	my $locallangs = $$languagestringref;
 -	$locallangs =~ s/_/ /g;
 -	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . $locallangs . ")"; }
-+	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . strftime("%Y%m%d.%H%M", localtime()) . ")"; }
++	if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
  	
  	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
  }