[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/bin

[Michael Meeks]

 solenv/bin/linkoo                     |    2 ++
 solenv/bin/modules/par2script/work.pm |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fe1ab87715705a6da447d1216ff708589fcc1db2
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Apr 4 16:08:25 2011 +0100

    friendlier error on malformed par files

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 37a5f1a..7c96b6a 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -35,6 +35,8 @@ use strict;
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
+# This file substantially, if not wholely written by volunteers, not Oracle
+#
 #*************************************************************************
 
 # ends up in program/ooenv
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index a862420..4d271ca 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -169,7 +169,10 @@ sub collect_definitions
 	    $oneitem = $1;
 	    $gid = $2;
 	} else {
-	    par2script::exiter::exit_program("ERROR: malformed par file, expecting <token> <gid> but saw '$line'", "test_par_syntax");
+	    chomp ($line);
+	    my $invalid = $line;
+	    $invalid =~ s/[\s\w]*//g;
+	    par2script::exiter::exit_program("ERROR: malformed par file, invalid character '$invalid', expecting <token> <gid> but saw '$line'", "test_par_syntax");
 	}
 #	print STDERR "line '$line' -> '$oneitem' '$gid'\n";