openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1547024 - /openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm
Date Mon, 02 Dec 2013 14:12:06 GMT
Author: af
Date: Mon Dec  2 14:12:06 2013
New Revision: 1547024

URL: http://svn.apache.org/r1547024
Log:
123595: Don't print newline as first character in line.

Modified:
    openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm

Modified: openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm?rev=1547024&r1=1547023&r2=1547024&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm Mon Dec  2 14:12:06
2013
@@ -163,16 +163,15 @@ sub compare_package_content
 	if ( $identical )
 	{
 		my $first = 1;
-		my $start = "\n";
 		foreach my $dest ( keys %{$newcontent} )
 		{
 			if ( ! exists($oldcontent->{$dest}) )
 			{
 				$identical = 0;
-                $installer::logger::Info->printf("%s...... file only in one package (A):
%s\n", $start, $dest);
+                $installer::logger::Info->print("\n") if $first;
+                $installer::logger::Info->printf("...... file only in one package (A):
%s\n", $dest);
 				$infoline = "File only in existing pool package: $dest\n";
 				push(@installer::globals::pcfdiffcomment, $infoline);
-				if ( $first ) { $start = ""; }	
 				$first = 0;
 			}
 		}
@@ -185,10 +184,10 @@ sub compare_package_content
 				if ( ! exists($newcontent->{$dest}) )
 				{
 					$identical = 0;
-                    $installer::logger::Info->printf("%s...... file only in one package
(B): %s\n", $start, $dest);
+                    $installer::logger::Info->print("\n") if $first;
+                    $installer::logger::Info->printf("...... file only in one package
(B): %s\n", $dest);
 					$infoline = "File only in new package: $dest\n";
 					push(@installer::globals::pcfdiffcomment, $infoline);	
-					if ( $first ) { $start = ""; }	
 					$first = 0;
 				}
 			}			



Mime
View raw message