solenv/bin/make_installer.pl | 4 ----
solenv/bin/modules/installer/globals.pm | 4 ----
solenv/bin/modules/installer/scriptitems.pm | 6 ------
3 files changed, 14 deletions(-)
New commits:
commit 3df89a4dc4f497f4c86c3ff906e2ee5ae5d36e77
Author: Thomas Arnhold <tho...@arnhold.org>
Date: Sat Aug 18 14:36:21 2012 +0200
installer: remove set but unused variables
global rpmcommand is not used, epmfile.pm uses installer::globals::rpm
Change-Id: I0b248c50b872bc8407f405062cf0c4766c3879fb
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 57dedc3..0da4dc5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1138,8 +1138,6 @@ for ( my $n = 0; $n <=
$#installer::globals::languageproducts; $n++ )
if ( $installer::globals::languagepack ) { $packagename =
$packagename . "_u"; }
elsif ( $installer::globals::helppack ) { $packagename =
$packagename . "_v"; } # wtf...
else { $packagename = $packagename . "u"; }
- my $savestring = $oldpackagename . "\t" . $packagename;
- push(@installer::globals::linkrpms, $savestring);
$linkaddon = "_links";
$installer::globals::linuxlinkrpmprocess = 1;
$linkpackage = 1;
@@ -1203,7 +1201,6 @@ for ( my $n = 0; $n <=
$#installer::globals::languageproducts; $n++ )
if ( ! ( $#{$filesinpackage} > -1 ))
{
- push(@installer::globals::emptypackages, $packagename);
$infoline = "\n\nNo file in package: $packagename \-\>
Skipping\n\n";
push(@installer::globals::logfileinfo, $infoline);
next; # next package, end of loop !
@@ -1314,7 +1311,6 @@ for ( my $n = 0; $n <=
$#installer::globals::languageproducts; $n++ )
if ( ! ( $#{$filesinpackage} > -1 ))
{
- push(@installer::globals::emptypackages, $packagename);
$infoline = "\nNo file in package: $packagename \-\>
Skipping\n";
push(@installer::globals::logfileinfo, $infoline);
next; # next package, end of loop !
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 6a2bc77..e77e8a4 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -167,7 +167,6 @@ BEGIN
$packageversion = 1;
$packagerevision = 1;
$rpm = "";
- $rpmcommand = "";
$rpminfologged = 0;
$debian = "";
$installertypedir = "";
@@ -200,7 +199,6 @@ BEGIN
$linuxlibrarybaselevel = "1";
$linuxlibrarypatchlevel = "1.1";
@linuxlinks = ();
- @linkrpms = ();
$archiveformat = "";
$updatelastsequence = 0;
$updatesequencecounter = 0;
@@ -258,7 +256,6 @@ BEGIN
$addlicensefile = 1;
$addsystemintegration = 0;
$makedownload = 1;
- @installsetfiles = ();
@binarytableonlyfiles = ();
@allscpactions = ();
$languagepackaddon = "LanguagePack";
@@ -377,7 +374,6 @@ BEGIN
@removedirs = ();
@removefiletable = ();
- @emptypackages = ();
$plat = $^O;
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 0911628..cc2d910 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1499,12 +1499,6 @@ sub add_License_Files_into_Installdir
$infoline = "New files: Using installation name:
$newfile->{'InstallName'}\n";
push( @installer::globals::logfileinfo, $infoline);
}
-
- # Collecting license and readme file for the installation set
-
- push(@installer::globals::installsetfiles, $newfile);
- $infoline = "New files: Adding file $newfilename to the file
collector for the installation set. Language: $defaultlanguage\n";
- push( @installer::globals::logfileinfo, $infoline);
}
push(@newfilesarray, $onefile);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
