* Fix line number display for config file parse errors.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index a5ff4de3c6e03955c5400a3fcbb146747bed5eec..11d1c2beb9874c310d2178d188f71b270775468e 100755 (executable)
--- a/mr
+++ b/mr
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 #man{{{
+
 =head1 NAME
 
 mr - a Multiple Repository management tool
@@ -227,6 +228,7 @@ Licensed under the GNU GPL version 2 or higher.
 http://kitenet.net/~joey/code/mr/
 
 =cut
+
 #}}}
 
 use warnings;
@@ -525,8 +527,10 @@ sub loadconfig { #{{{
        close $in;
 
        my $section;
+       my $line=0;
        while (@lines) {
                $_=shift @lines;
+               $line++;
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
@@ -539,6 +543,7 @@ sub loadconfig { #{{{
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);
+                               $line++;
                                $value.="\n$1";
                                chomp $value;
                        }
@@ -570,7 +575,7 @@ sub loadconfig { #{{{
                        }
                }
                else {
-                       die "$f line $.: parse error\n";
+                       die "$f line $line: parse error\n";
                }
        }