[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-11 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

Jeremy Harris  changed:

   What|Removed |Added

 Status|WAIT_FIX_CONFIRMATION   |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-11 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

Git Commit  changed:

   What|Removed |Added

 CC||g...@exim.org

--- Comment #4 from Git Commit  ---
Git commit:
https://git.exim.org/exim.git/commitdiff/27607d0311c4b32440c6a3396e4a022640dd930e

commit 27607d0311c4b32440c6a3396e4a022640dd930e
Author: Jeremy Harris 
AuthorDate: Fri May 10 13:02:28 2019 +0100
Commit: Jeremy Harris 
CommitDate: Sat May 11 13:21:46 2019 +0100

Utilities: add -G option to exiqgrep.  Bug 2397
---
 doc/doc-docbook/spec.xfpt | 5 +
 src/src/exiqgrep.src  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index dea7bc7..e2f1eaf 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -37720,6 +37720,11 @@ Match only frozen messages.

 .vitem &*-x*&
 Match only non-frozen messages.
+
+.new
+.vitem &*-G*&&~<&'queuename'&>
+Match only messages in the given queue.  Without this, the default queue is
searched.
+.wen
 .endlist

 The following options control the format of the output:
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index c4f7c4b..c8762df 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -53,11 +53,12 @@ if ($ARGV[0] eq '--version') {
 exit 0;
 }

-getopts('hf:r:y:o:s:C:zxlibRca',\%opt);
+getopts('hf:r:y:o:s:C:zxlibRcaG:',\%opt);
 if ($ARGV[0]) {  exit;}
 if ($opt{h}) {  exit;}
 if ($opt{a}) { $eargs = '-bp'; }
 if ($opt{C} && -e $opt{C} && -f $opt{C} && -R $opt{C}) { $eargs .= ' -C
'.$opt{C}; }
+if ($opt{G}) { $eargs .= ' -qG'.$opt{G}; }

 # Read message queue output into hash
 ();
@@ -83,6 +84,7 @@ Selection criteria:
 -o Message older than
 -zFrozen messages only (exclude non-frozen)
 -xNon-frozen messages only (exclude frozen)
+-G Match in given queue only

 [ NB: for regexps, provided string sits in // ]

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-11 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

--- Comment #3 from Jeremy Harris  ---
Thanks for the checking.  You can tell I'm not a perl programmer.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-10 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

Sven Hartge  changed:

   What|Removed |Added

   Attachment #1188|0   |1
is obsolete||

--- Comment #2 from Sven Hartge  ---
Created attachment 1189
  --> https://bugs.exim.org/attachment.cgi?id=1189=edit
fixed exiqgrep.patch

I fixed your proposed patch.

The if had a } instead of a ) and was also missing the space before -qG.

With those fixes, it works fine.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-10 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

--- Comment #1 from Jeremy Harris  ---
Created attachment 1188
  --> https://bugs.exim.org/attachment.cgi?id=1188=edit
proposed patch

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-10 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

Jeremy Harris  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|ni...@exim.org  |jgh146...@wizmail.org

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##


[exim-dev] [Bug 2397] exiqgrep only greps the main queue when using multiple queues

2019-05-10 Thread admin--- via Exim-dev
https://bugs.exim.org/show_bug.cgi?id=2397

Jeremy Harris  changed:

   What|Removed |Added

 Status|ASSIGNED|WAIT_FIX_CONFIRMATION

-- 
You are receiving this mail because:
You are on the CC list for the bug.
-- 
## List details at https://lists.exim.org/mailman/listinfo/exim-dev Exim 
details at http://www.exim.org/ ##