diff --git a/additional/.gitignore b/additional/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/pfHandle.spec b/pfHandle.spec index aad65e2..aa55cf6 100644 --- a/pfHandle.spec +++ b/pfHandle.spec @@ -2,7 +2,7 @@ Summary: Postfix management wrapper utility Name: pfHandle Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://launchpad.net/pfhandle @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man5/%{name}.5.gz %changelog +* Tue Nov 04 2025 Vasarhelyi Zsolt 1.1-6.sme +- Fix listing queues, remove color output [SME: 12853] + * Tue Sep 23 2025 Jean-Philippe Pialasse 1.1-5.sme - Initial import for Koozali SME Server 11 diff --git a/root/pfHandle b/root/pfHandle index aed9d85..3681f0e 100755 --- a/root/pfHandle +++ b/root/pfHandle @@ -103,7 +103,7 @@ sub Get_Queue foreach (@qlist1) { my ($test) = qx|file $pfdir/$queue|; - if ($test !~ /directory/) { push(@qlist, $_); } + if ($_ !~ /directory/) { push(@qlist, $_); } } } else { @@ -181,7 +181,6 @@ sub List_Queue my $do = shift; if (!$do) { $do = 0; } my ($count, %queue); - my ($cmsg, $cstat, $cend) = ("\e[01;34m", "\e[01;31m", "\e[00m"); if ($queue) { $count = &Get_Queue($queue, $do); @@ -193,11 +192,9 @@ sub List_Queue { if ($do ne "stats") { - print $cstat; print "####################\n"; print "##### \U$_\n"; print "####################\n"; - print $cend; } my $c = &Get_Queue($_, $do); $count += $c;