From 01b8c19bc5da6f55a2667f86939eb35961e6eabf Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 16 May 2003 10:59:03 +0000 Subject: fix pot generation (have \" instead of \\\") --- MDK/Common.pm.pl | 2 +- perl-MDK-Common.spec | 5 ++++- perl_checker.src/lexer.mll | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/MDK/Common.pm.pl b/MDK/Common.pm.pl index 5b8b177..d478576 100644 --- a/MDK/Common.pm.pl +++ b/MDK/Common.pm.pl @@ -71,7 +71,7 @@ use vars qw(@ISA @EXPORT $VERSION); #); # perl_checker: RE-EXPORT-ALL @EXPORT = map { @$_ } map { values %{'MDK::Common::' . $_ . 'EXPORT_TAGS'} } grep { /::$/ } keys %MDK::Common::; -$VERSION = "1.1.2"; +$VERSION = "1.1.3"; 1; EOF diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec index d17f66a..958b7ea 100644 --- a/perl-MDK-Common.spec +++ b/perl-MDK-Common.spec @@ -2,7 +2,7 @@ # do not change the version here, change in MDK/Common.pm.pl %define version THEVERSION -%define release 2mdk +%define release 1mdk Summary: Various simple functions Name: perl-MDK-Common @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT # MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common %changelog +* Fri May 16 2003 Pixel 1.1.3-1mdk +- fix pot generation (have \" instead of \\\") + * Mon May 12 2003 Pixel 1.1.2-2mdk - rebuild for perl auto-provides (except for perl-MDK-Common-devel which need special handling for the faked packages) diff --git a/perl_checker.src/lexer.mll b/perl_checker.src/lexer.mll index 5f839bd..2b27689 100644 --- a/perl_checker.src/lexer.mll +++ b/perl_checker.src/lexer.mll @@ -802,7 +802,8 @@ and string_escape = parse | Delimited -> if c = String.make 1 !delimit_char then warn lexbuf ("change the delimit character " ^ String.make 1 !delimit_char ^ " to get rid of this escape") else warn_escape_unneeded lexbuf c); - next_s ("\\" ^ lexeme lexbuf) (Stack.pop next_rule) lexbuf + let c = if c = "\"" then c else "\\" ^ c in + next_s c (Stack.pop next_rule) lexbuf } and re_string_escape = parse -- cgit v1.2.1