From 5527b3435c916162555b9a48cd8adeaed512f658 Mon Sep 17 00:00:00 2001
From: jeakins <jeakins@ucsd.edu>
Date: Mon, 25 Apr 2016 17:16:11 -0700
Subject: [PATCH] Fix unclear error message when both -s and -S were used

---
 bin/usarray/q330logs2db/q330logs2db.xpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/usarray/q330logs2db/q330logs2db.xpl b/bin/usarray/q330logs2db/q330logs2db.xpl
index 7496cd5e8..cf2d77aca 100755
--- a/bin/usarray/q330logs2db/q330logs2db.xpl
+++ b/bin/usarray/q330logs2db/q330logs2db.xpl
@@ -133,7 +133,7 @@ if ( $opt_s && ( ! $opt_S || ! -e $statefile ) ) {
    }
    elog_notify("starting from pktid: $pktstart\n");
 
-} elsif ($opt_S) {	# implies there is an $opt_S too
+} elsif ($opt_s && $opt_S) {	# implies there is an $opt_S too
    elog_complain("Using state file for first pktid\n");
    elog_complain("State file overrides -s $opt_s \n") if $opt_s ;
 
@@ -319,12 +319,16 @@ sub cmdline { # &cmdline();
 
     
     $cmdline = "command line:	$0 " ;
+    $cmdline = $cmdline . " -p $opt_p " if $opt_p;
     $cmdline = $cmdline . " -v " if $opt_v;
     $cmdline = $cmdline . " -V " if $opt_V;
+    $cmdline = $cmdline . " -q " if $opt_q;
+    $cmdline = $cmdline . " -X " if $opt_X;
     $cmdline = $cmdline . " -l '$opt_l' " if $opt_l;
-    $cmdline = $cmdline . " -p $opt_p " if $opt_p;
+    $cmdline = $cmdline . " -S $opt_S " if $opt_S;
     $cmdline = $cmdline . " -s $opt_s " if $opt_s;
     $cmdline = $cmdline . " @ARGV \n" ;
+            \nUSAGE: $0 [-p pf] [-v] [-q] [-X] [-l match_logname] [-S state] [-s {start_time|OLDEST}] orb db 
 
     return;
 }