Hi,
On Sat, 04 Dec 2010 14:35:29 +0900 (JST), Takeshi Abe <tabe@fixedpoint.jp> wrote:
OK, I end up getting sane so that replacing them with git & sed has done
by the attached script. After runnging it on each git working dir and
double checking, I made up the attached patch with some tweaks.
Sorry, I found more missing hunks exist as attached.
Cheers,
-- Takeshi Abe
From b353f54f6951f39fa966aedceffc6df063dab49b Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Sat, 4 Dec 2010 21:23:36 +0900
Subject: [PATCH] more occured replaced
---
solenv/bin/modules/installer/servicesfile.pm | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/solenv/bin/modules/installer/servicesfile.pm
b/solenv/bin/modules/installer/servicesfile.pm
index c113be6..3c54723 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -154,7 +154,7 @@ sub register_unocomponents
$filestring = "";
}
- if (( $local_error1_occurred ) || ( $local_error2_occured )) { $error_occured = 1; }
+ if (( $local_error1_occurred ) || ( $local_error2_occurred )) { $error_occurred = 1; }
}
return $error_occurred;
@@ -462,7 +462,7 @@ sub register_all_components
if ( $#javacomponents > -1 ) { $java_error_occurred =
register_javacomponents($allvariableshashref, \@javacomponents, $regcompfileref, $servicesfile,
$regcomprdb, $javaservicesurlprefix); }
if ( $#pythoncomponents > -1 ) { $python_error_occurred =
register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile,
$includepatharrayref); }
- if ( $uno_error_occurred || $java_error_occured || $python_error_occured ) {
$registererrorflag = 1; }
+ if ( $uno_error_occurred || $java_error_occurred || $python_error_occurred ) {
$registererrorflag = 1; }
return $registererrorflag;
}
--
1.7.2.3
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.