[Libreoffice-commits] core.git: solenv/bin
Thomas Arnhold
thomas at arnhold.org
Wed Sep 11 18:39:34 PDT 2013
solenv/bin/modules/installer.pm | 1 -
solenv/bin/modules/installer/archivefiles.pm | 8 --------
solenv/bin/modules/installer/globals.pm | 10 ----------
solenv/bin/modules/installer/scriptitems.pm | 2 --
solenv/bin/modules/installer/windows/directory.pm | 1 -
solenv/bin/modules/installer/windows/file.pm | 1 -
solenv/bin/modules/installer/windows/msiglobal.pm | 3 +--
solenv/bin/modules/installer/windows/update.pm | 2 --
solenv/bin/modules/par2script/work.pm | 2 --
solenv/bin/modules/pre2par/language.pm | 1 -
10 files changed, 1 insertion(+), 30 deletions(-)
New commits:
commit 9581d5c59f5a9ff64329202590adf0b9fdf468a3
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Sep 12 03:39:06 2013 +0200
installer: remove unused variables
Change-Id: I3c9669f6fdf25a1a244335ae0317c3a8a933762b
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 89e202f..7093e64 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -458,7 +458,6 @@ sub run {
@installer::globals::logfileinfo = (); # new logfile array and new logfile name
installer::logger::copy_globalinfo_into_logfile();
- $installer::globals::globalinfo_copied = 1;
my $logminor = "";
$logminor = $installer::globals::minor;
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 8c569cf..c4fd031 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -199,13 +199,6 @@ sub resolving_archive_flag
if ( $onefile->{'Selectfiles'} ) { $onefile->{'Selectfiles'} = ""; } # Selected files list no longer required
- # mechanism to define patch files inside an archive files
- my $select_patch_files = 0;
- my $patchlistfiles = "";
- my @keptpatchflags = ();
-
- if ( $onefile->{'Patchfiles'} ) { $onefile->{'Patchfiles'} = ""; } # Patch file list no longer required
-
# creating directories
my $onelanguage = $onefile->{'specificlanguage'};
@@ -298,7 +291,6 @@ sub resolving_archive_flag
}
}
- my $zipfileref = \@zipfile;
my $unziperror = 0;
foreach my $zipname ( $zip->memberNames() )
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index f6bc9fc..3cc3aef 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -120,9 +120,7 @@ BEGIN
$updatesequencecounter = 0;
$updatedatabase = 0;
$updatedatabasepath = "";
- $pfffileexists = 0;
$pffcabfilename = "ooobasis3.0_pff.cab";
- $mergemodulenumber = 0;
%allmergemodulefilesequences = ();
%newupdatefiles = ();
%allusedupdatesequences = ();
@@ -138,7 +136,6 @@ BEGIN
@globallogfileinfo = ();
$ignore_error_in_logfile = 0;
$exitlog = "";
- $globalinfo_copied = 0;
$quiet = 0;
$ismultilingual = 0;
@@ -174,7 +171,6 @@ BEGIN
@binarytableonlyfiles = ();
@allscpactions = ();
$languagepackaddon = "LanguagePack";
- $patchaddon = "Patch";
$ooodownloadfilename = "";
$downloadfilename = "";
$downloadfileextension = "";
@@ -239,24 +235,18 @@ BEGIN
$localinstalldirset = 0;
$localinstalldir = "";
- $urefile = "";
-
$postprocess_specialepm = 0;
$postprocess_standardepm = 0;
$mergemodules_analyzed = 0;
@packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
- @languagepackfeature =();
- @helppackfeature =();
@featurecollector =();
$msiassemblyfiles = "";
$macinstallfilename = "macinstall.ulf";
$extensioninstalldir = "gid_Dir_Share_Extension_Install";
@languagenames = ();
- @requiredpackages = ();
%componentcondition = ();
%componentid = ();
- %comparecomponentname = ();
%allcabinets = ();
%allcabinetassigns = ();
%cabfilecounter = ();
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 883888d..e0ed89f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -544,8 +544,6 @@ sub shift_basis_directory_parents
my ($dirsref) = @_;
my @alldirs = ();
- my @savedirs = ();
- my @shifteddirs = ();
my $officedirgid = "";
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index a4884c1..97e9e1c 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -145,7 +145,6 @@ sub create_unique_directorynames
my %shortdirhash = ();
my %shortdirhashreverse = ();
my $infoline = "";
- my $errorcount = 0;
for ( my $i = 0; $i <= $#{$directoryref}; $i++ )
{
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 93f7cc5..a1026db 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -609,7 +609,6 @@ sub get_sequence_for_file
$fileentry->{'Component_'} = $onefile->{'componentname'};
if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
$onefile->{'PostFinalFile'} = 1;
- # $installer::globals::pfffileexists = 1;
# The sequence for this file has changed. It has to be inserted at the end of the files collector.
$installer::globals::insert_file_at_end = 1;
$installer::globals::newfilescollector{$sequence} = $onefile; # Adding new files to the end of the filescollector
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 705e575..492b4a7 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -169,7 +169,6 @@ sub generate_cab_file_list
my $sequenceorder = get_sequenceorder($filesref);
my $counter = 1;
- my $currentcabfile = "";
while ( ( exists($sequenceorder->{$counter}) ) || ( exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking care of files from merge modules
{
@@ -1547,7 +1546,7 @@ sub read_saved_mappings
my $errorstring = "";
my $error_occurred = 0;
my $file_error_occurred = 0;
- my $dir_error = 0;
+ my $dir_error_occurred = 0;
my $idtdir = $installer::globals::previous_idt_dir;
$idtdir =~ s/\Q$installer::globals::separator\E\s*$//;
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index 634d7e0..d49625a 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -420,8 +420,6 @@ sub readmergedatabase
my %allmergefiles = ();
- $installer::globals::mergemodulenumber = $#{$mergemodules} + 1;
-
foreach my $mergemodule ( @{$mergemodules} )
{
my $filename = $mergemodule->{'Name'};
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index e46f8d8..9c03078 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -193,8 +193,6 @@ sub collect_definitions
$i++;
}
- my $allitemhash = \$par2script::globals::definitions{$oneitem};
-
# test of uniqueness
if ( defined ($par2script::globals::definitions{$oneitem}->{$gid}) )
{
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index 842c86d..332bb98 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -121,7 +121,6 @@ sub localize
# print "line '$oneline' split to '$language' '$variable'\n";
if (defined $replace_hash->{$variable}) {
- my $languageblock = $replace_hash->{$variable};
my $newstring = get_language_string_from_language_block($replace_hash->{$variable}, $language);
if ( $newstring eq "" ) { $newstring = "\"" . $variable . "\""; }
More information about the Libreoffice-commits
mailing list