[Libreoffice-commits] .: 2 commits - solenv/bin

[Tim Retout]

 solenv/bin/modules/installer/download.pm |   74 ++-----------------------------
 1 file changed, 5 insertions(+), 69 deletions(-)

New commits:
commit 0038f19b97f5e036870d2210f975358c18e5809e
Author: Tim Retout <tim at retout.co.uk>
Date:   Tue Aug 14 22:13:55 2012 +0100

    Remove unused create_download_link_tree
    
    Change-Id: I319dd0cff6f471fa6ca38d5fcf0f99c462836a83

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 7310bde..7c4e23d 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -941,71 +941,4 @@ sub create_download_sets
     return $downloaddir;
 }
 
-####################################################
-# Creating LO upload tree
-####################################################
-
-sub create_download_link_tree
-{
-    my ($downloaddir, $languagestringref, $allvariableshashref) = @_;
-
-    my $infoline;
-
-    installer::logger::print_message( "\n******************************************\n" );
-    installer::logger::print_message( "... creating download hard link ...\n" );
-    installer::logger::print_message( "******************************************\n" );
-
-    installer::logger::include_header_into_logfile("Creating download hard link:");
-    installer::logger::include_timestamp_into_logfile("\nPerformance Info: Creating hard link, start");
-
-    if ( is_supported_platform() )
-    {
-        my $versionstring = "";
-        # Already defined $installer::globals::oooversionstring and $installer::globals::ooodownloadfilename ?
-
-        if ( ! $installer::globals::oooversionstring ) { $versionstring = get_current_version(); }
-        else { $versionstring = $installer::globals::oooversionstring; }
-
-        # Is $versionstring empty? If yes, there is nothing to do now.
-
-        $infoline = "Version string is set to: $versionstring\n";
-        push( @installer::globals::logfileinfo, $infoline);
-
-        if ( $versionstring )
-        {
-            # Now the downloadfilename has to be set (if not already done)
-            my $destdownloadfilename = "";
-            if ( ! $installer::globals::ooodownloadfilename ) { $destdownloadfilename = set_download_filename($languagestringref, $versionstring, $allvariableshashref); }
-            else { $destdownloadfilename = $installer::globals::ooodownloadfilename; }
-
-            if ( $destdownloadfilename )
-            {
-                $destdownloadfilename = $destdownloadfilename . $installer::globals::downloadfileextension;
-
-                $infoline = "Setting destination download file name: $destdownloadfilename\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                my $sourcedownloadfile = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
-
-                $infoline = "Setting source download file name: $sourcedownloadfile\n";
-                push( @installer::globals::logfileinfo, $infoline);
-
-                create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
-            }
-        }
-        else
-        {
-            $infoline = "Version string is empty. Nothing to do!\n";
-            push( @installer::globals::logfileinfo, $infoline);
-        }
-    }
-    else
-    {
-        $infoline = "Platform not used for hard linking. Nothing to do!\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
-
-    installer::logger::include_timestamp_into_logfile("Performance Info: Creating hard link, stop");
-}
-
 1;
commit 9b69ef1013d60e655eb4545d1a2af1e2fae8e695
Author: Tim Retout <tim at retout.co.uk>
Date:   Tue Aug 14 20:16:17 2012 +0100

    installer::download: Enable strict and warnings.
    
    Change-Id: I4499968f00e313187ef7792954f3168bfadb2f6e

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b21bbe3..7310bde 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -27,6 +27,9 @@
 
 package installer::download;
 
+use strict;
+use warnings;
+
 use File::Spec;
 use installer::exiter;
 use installer::files;
@@ -644,7 +647,7 @@ sub create_tar_gz_file_from_directory
     $installer::globals::downloadfilename = $downloadfilename . $installer::globals::downloadfileextension;
     my $targzname = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
 
-    $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname";
+    my $systemcall = "cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip > $targzname";
 
     my $returnvalue = system($systemcall);
 
@@ -679,7 +682,7 @@ sub resolve_variables_in_downloadname
     if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; }
     $downloadname =~ s/\{productversion\}/$productversion/;
 
-    my $ppackageversion = "";
+    my $packageversion = "";
     if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; }
     $downloadname =~ s/\{packageversion\}/$packageversion/;