On 2011-10-07 at 12:09 -0700, Todd Lyons wrote:
> Howerver, in the RC's, exiqgrep is giving me problems when I use it:
>
> # exiqgrep -z -i | xargs exim -Mrm
> Line mismatch: 3d 834 1RB5wx-0007ag-Ba <>
>
> Looking at older versions of exiqgrep (with .orig), I see this
> difference (new version is missing a question mark) :
> - if ($line =~
> /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z]?)?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/)
> {
> + if ($line =~
> /^\s*(\w+)\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*(\w{6}-\w{6}-\w{2})\s+(<.*?>)/)
> {
> However, I looked at the version in the git repo and it's not got any
> of those (?:) groupings, and I figured it must be a local patch that
> I'm doing, but I looked through all of my patches and I didn't see
> anything that touched that file. So I'm a bit unsure where that comes
> from?
I see that code in the git repo; are you on branch master, and pull'd up
to date?
That line was modified on 2011-02-06 in change bd4c9759. ("git
annotate").
This is:
NM/04 Fixed exiqgrep to cope with mailq missing size issue
Fixes bug 943.
but that change replaced:
\s+(\S+)\s+
with:
\s+((?:\d+(?:\.\d+)?[A-Z])?)\s*
Is it possible that you fixed this locally earlier and forgot about it?
It looks like a correct fix; the size field is generated by
string_format_size() which can append: no modifier, 'K' or 'M'.
Fix pushed upstream to master repo; looks correct, I haven't tested it
(but I'm confident enough in my regexp skills to push that change
anyway). But, er, still .... if you could test the exiqgrep.src from
HEAD, I'd appreciate it. :)
Thanks,
-Phil
