From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 2 Nov 2004 17:19:17 +0000 (+0000)
Subject: --sort should not imply --join if --trace is also specified.
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~375
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ab12babf063f635ee162e9c61dad3f8198f6dc3b;p=openldap

--sort should not imply --join if --trace is also specified.
---

diff --git a/contrib/slapd-tools/statslog b/contrib/slapd-tools/statslog
index 0cc07da3ff..2a49d7fbfd 100755
--- a/contrib/slapd-tools/statslog
+++ b/contrib/slapd-tools/statslog
@@ -81,7 +81,7 @@ BEGIN {
 usage() unless $getopt_ok;
 usage("--trace is incompatible with --join.\n") if $trace && $join_files;
 
-$join_files = 1 if $sort_files && !defined($join_files);
+$join_files = 1 if !defined($join_files) && $sort_files && !$trace;
 use constant BRIEF => !!$brief;
 use constant LOOSE => defined($no_loose) && ($no_loose eq ".^" ? 2 : 1);