From c9d2fc624905cd0af96ee9f84317d562a042fe14 Mon Sep 17 00:00:00 2001
From: Leah Leshchinsky <lleshchi@redhat.com>
Date: Wed, 6 Oct 2021 13:21:50 -0400
Subject: [PATCH] tuna: Add distinction between --spread and --move to error
 message

Currently, the command `tuna --cpus=CPU-LIST --spread` generates an
error with the warning "tuna: --move requires a list of threads/irqs!".
Similarly, when the command `tuna --threads=THREAD-LIST --spread` is
run, it generates the warning "tuna: --move requires a cpu list!".

This can be confusing to the user, especially with commands that use both
the "--spread" and "--move" flags. The warning should specify "--spread"
when that is the source of the error.

Check whether the argument is a move or spread and update the warning
string accordingly.

Signed-off-by: Leah Leshchinsky <lleshchi@redhat.com>
---
 tuna-cmd.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tuna-cmd.py b/tuna-cmd.py
index 8617966..8dfad9e 100755
--- a/tuna-cmd.py
+++ b/tuna-cmd.py
@@ -633,15 +633,14 @@ def main():
         elif o in ("-n", "--show_sockets"):
             show_sockets = True
         elif o in ("-m", "--move", "-x", "--spread"):
+            spread = o in ("-x", "--spread")
             if not cpu_list:
-                print("tuna: --move " + _("requires a cpu list!"))
+                print("tuna: %s " % ("--spread" if spread else "--move") + _("requires a cpu list!"))
                 sys.exit(2)
             if not (thread_list or irq_list):
-                print("tuna: --move " + _("requires a list of threads/irqs!"))
+                print("tuna: %s " % ("--spread" if spread else "--move") + _("requires a list of threads/irqs!"))
                 sys.exit(2)
 
-            spread = o in ("-x", "--spread")
-
             if thread_list:
                 tuna.move_threads_to_cpu(cpu_list, thread_list, spread=spread)
 
-- 
2.27.0