diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2017-03-13 10:49:03 -0400 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-03-27 20:12:46 +0000 |
| commit | f927282853407ff6bcf1dc58b1dc86dcb015be0f (patch) | |
| tree | d96eacded2df5506c90f673e1ee2a2e1abd2e5d5 /solenv | |
| parent | 29c066ee3c0bf307ca14851dd35e314ab1a3f20b (diff) | |
Remove last use of md5sum (in building)
Switch to using sha256sum for checking if files change. Not for
security, just so we don't need to check for md5sum.
We also change the Windows installer to rely on the perm md5
digest instead of the environment variable. The code to do this was
already in directory.pm
Change-Id: I24aed542c6201abf030fdd62116aec3f8ea3513b
Reviewed-on: https://gerrit.libreoffice.org/35140
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer.pm | 6 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index a29beb09efb2..3d88b9986e14 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -466,8 +466,10 @@ sub run { if (length($loglanguagestring) > $installer::globals::max_lang_length) { my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring); - chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`); - my $id = substr($shorter, 0, 8); # taking only the first 8 digits + #replace this in the same it was done in installer/windows/directory.pm + #chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`); + #my $id = substr($shorter, 0, 8); # taking only the first 8 digits + my $id = installer::windows::msiglobal::calculate_id($loglanguagestring, 8); # taking only the first 8 digits $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id; } diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 0c17b48436e7..4a5ff8d008b4 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -25,6 +25,7 @@ use installer::exiter; use installer::globals; use installer::pathanalyzer; use installer::remover; +use installer::windows::msiglobal; ###################################################### # Creating a new direcotory @@ -252,8 +253,10 @@ sub create_directories if (length($languagestring) > $installer::globals::max_lang_length ) { my $number_of_languages = get_number_of_langs($languagestring); - chomp(my $shorter = `echo $languagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`); - my $id = substr($shorter, 0, 8); # taking only the first 8 digits + #replace this in the same it was done in installer/windows/directory.pm + #chomp(my $shorter = `echo $languagestring | $ENV{'MD5SUM'} | sed -e "s/ .*//g"`); + #my $id = substr($shorter, 0, 8); # taking only the first 8 digits + my $id = installer::windows::msiglobal::calculate_id($languagestring, 8); # taking only the first 8 digits $languagestring = "lang_" . $number_of_languages . "_id_" . $id; } |