[Libreoffice-commits] core.git: solenv/bin

[Yousuf Philips]

 solenv/bin/packimages.pl |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 96983b2a2cad767cb3bfd77ce60acfe31402dd9c
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue Oct 13 14:58:05 2015 +0400

    Output all links.txt icons pointing to other icons in one go
    
    Change-Id: I9fa031c84157d573a63c9e31458ba578618e1596
    Reviewed-on: https://gerrit.libreoffice.org/19350
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 0e98566..b05b83f 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -507,13 +507,19 @@ sub write_links($)
 sub check_links($)
 {
     my $links = shift;
+    my $stop_die = 0;
 
     for my $link (keys %{$links}) {
         my $value = $links->{$link};
         if (defined $links->{$value}) {
-            die "Link to another link: $link -> $value -> " . $links->{$value};
+            print STDERR "\nLink: $link -> $value -> " . $links->{$value};
+            $stop_die = 1;
         }
     }
+    if ( $stop_die ) {
+        die "\nSome icons in links.txt were found to link to other linked icons.\n\n";
+    }
+
 }
 
 # remove any files from our zip list that are linked