summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/parse.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-30 15:02:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-30 15:02:59 +0000
commitd43047f679ab6a72106d50f2f0ca58530ca31845 (patch)
treea44a20f48eb348d9f9417363d8f4bf509ff4d07e /perl-install/Xconfig/parse.pm
parent0908aa8eba697d699e4df007c6e3f5e2bb2a19ce (diff)
downloaddrakx-backup-do-not-use-d43047f679ab6a72106d50f2f0ca58530ca31845.tar
drakx-backup-do-not-use-d43047f679ab6a72106d50f2f0ca58530ca31845.tar.gz
drakx-backup-do-not-use-d43047f679ab6a72106d50f2f0ca58530ca31845.tar.bz2
drakx-backup-do-not-use-d43047f679ab6a72106d50f2f0ca58530ca31845.tar.xz
drakx-backup-do-not-use-d43047f679ab6a72106d50f2f0ca58530ca31845.zip
fix handling of commented empty line
Diffstat (limited to 'perl-install/Xconfig/parse.pm')
-rw-r--r--perl-install/Xconfig/parse.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
index d94c772c9..bc492eebd 100644
--- a/perl-install/Xconfig/parse.pm
+++ b/perl-install/Xconfig/parse.pm
@@ -55,7 +55,7 @@ sub raw_from_file { #- internal
if (/^$/) {
$comment .= "\n" if $comment;
next;
- } elsif (/^#\W/) {
+ } elsif (/^#\W/ || /^#$/) {
s/^#\s+/# /;
$comment .= "$_\n";
next;
@@ -91,7 +91,7 @@ sub raw_from_file { #- internal
s/(\s*#.*)/$comment_on_line = $1; ''/e;
if (/^$/) {
- die "$line: weird";
+ die "$file:$line: weird";
}
(my $name, my $Option, $_) =