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

Stephan Bergmann sbergman at redhat.com
Thu Jul 11 07:30:50 PDT 2013


 solenv/bin/modules/par2script/check.pm |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1e5cea126cbb014582f4395e85a8eca1ac63354f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jul 11 16:23:53 2013 +0200

    Make an undefined Shortcut FileID a hard error
    
    ...so that regressions like the missing libjava_uno.jnilib in fdo#66703
    "REPORTBUILDER - report design wizard does not start on click (missing
    libjava_uno.jnilib symlink)" are found earlier in the future.  (It is unclear to
    me why it had been demoted to a warning right from its inception in
    5b6ee999707ef33bf8bbab6848f331df072543ae "INTEGRATION: CWS native99 (1.6.738);
    FILE MERGED.")
    
    Change-Id: I415477cff39b4a6b848701374c7f9dbb8ab2f6ba

diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
index 0ea1ec1..727cd7c 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -286,8 +286,7 @@ sub check_shortcut_assignments
         if (( exists($allshortcuts->{$shortcut}->{'FileID'}) ) &&
             ( ! exists($allfiles->{$allshortcuts->{$shortcut}->{'FileID'}}) ))
         {
-            # die "\nERROR: FileID $allshortcuts->{$shortcut}->{'FileID'} has no definition at shortcut $shortcut !\n";
-            print "\n\tWARNING: FileID $allshortcuts->{$shortcut}->{'FileID'} has no definition at shortcut $shortcut !\n";
+            die "\nERROR: FileID $allshortcuts->{$shortcut}->{'FileID'} has no definition at shortcut $shortcut !\n";
         }
 
         if (( exists($allshortcuts->{$shortcut}->{'ShortcutID'}) ) &&


More information about the Libreoffice-commits mailing list