[Libreoffice-commits] core.git: bin/module-deps.pl

Peter Foley pefoley2 at pefoley.com
Thu Jan 28 00:02:28 PST 2016


 bin/module-deps.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ce412f309b551d72f80e12f6fc8a64b429ef339
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Fri Jan 15 23:35:28 2016 -0500

    modules-deps.pl cleanup
    
    Change-Id: Ic450869c18991b9ed715bb31052dfb911fe3c789
    Reviewed-on: https://gerrit.libreoffice.org/21508
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Matúš Kukan <matus at libreoffice.org>

diff --git a/bin/module-deps.pl b/bin/module-deps.pl
index 8134dff..c742b71 100755
--- a/bin/module-deps.pl
+++ b/bin/module-deps.pl
@@ -222,7 +222,7 @@ sub collapse_lib_to_module($)
     my %unknown_libs;
     for my $lib_name (sort keys %{$tree}) {
         my $result = $tree->{$lib_name};
-        $unknown_libs{$lib_name} = 1 && next if (!grep {/$lib_name/} keys $l2m);
+        $unknown_libs{$lib_name} = 1 && next if (!grep {/$lib_name/} keys %$l2m);
 
     # new collapsed name.
         my $name = $l2m->{$lib_name};
@@ -295,7 +295,7 @@ sub prune_leaves($)
 sub annotate_mergelibs($)
 {
     my $tree = shift;
-    print STDERR "annotating mergelibs";
+    print STDERR "annotating mergelibs\n";
     for my $name (keys %{$tree}) {
     if (defined $merged_libs{$name}) {
         $tree->{$name}->{merged} = 1;


More information about the Libreoffice-commits mailing list